qt: update to Qt 6.7.0

modules/gui/qt/maininterface/compositor_dcomp.cpp

@@ -47,8 +47,10 @@
 #endif
 
 #if __has_include(<d3d12.h>) && __has_include(<d3d12sdklayers.h>)
-#define QRhiD3D12_ACTIVE
 #include <QtGui/private/qrhid3d12_p.h>
+#if (QT_VERSION < QT_VERSION_CHECK(6, 7, 0)) || defined(QRHI_D3D12_AVAILABLE)
+#define QRhiD3D12_ACTIVE
+#endif
 #endif
 
 #endif

modules/gui/qt/maininterface/interface_window_handler.cpp

@@ -67,7 +67,7 @@ InterfaceWindowHandler::InterfaceWindowHandler(qt_intf_t *_p_intf, MainCtx* main
 
         if (m_mainCtx->isHideAfterCreation())
             m_window->hide();
-    }, Qt::QueuedConnection, nullptr);
+    }, Qt::QueuedConnection);
 
     m_window->setTitle("");
 

modules/gui/qt/player/player_controller_p.hpp

@@ -59,7 +59,11 @@ public:
     void callAsync(Fun&& fun)
     {
         Q_Q(PlayerController);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+        QMetaObject::invokeMethod(q, [fun = std::forward<Fun>(fun)]() -> void* { fun(); return nullptr; }, Qt::QueuedConnection);
+#else
         QMetaObject::invokeMethod(q, std::forward<Fun>(fun), Qt::QueuedConnection, nullptr);
+#endif
     }
 
 public:

modules/gui/qt/playlist/playlist_controller_p.hpp

@@ -42,7 +42,11 @@ public:
     inline void callAsync(Fun&& fun)
     {
         Q_Q(PlaylistController);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+        QMetaObject::invokeMethod(q, [fun = std::forward<Fun>(fun)]() -> void* { fun(); return nullptr; }, Qt::QueuedConnection);
+#else
         QMetaObject::invokeMethod(q, std::forward<Fun>(fun), Qt::QueuedConnection, nullptr);
+#endif
     }
 
     //playlist

modules/gui/qt/playlist/playlist_model_p.hpp

@@ -41,7 +41,11 @@ public:
     inline void callAsync(Fun&& fun)
     {
         Q_Q(PlaylistListModel);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+        QMetaObject::invokeMethod(q, [fun = std::forward<Fun>(fun)]() -> void* { fun(); return nullptr; }, Qt::QueuedConnection);
+#else
         QMetaObject::invokeMethod(q, std::forward<Fun>(fun), Qt::QueuedConnection, nullptr);
+#endif
     }
 
     void onItemsReset(const QVector<PlaylistItem>& items);

modules/gui/qt/plugins.hpp

@@ -61,7 +61,11 @@
     Q_IMPORT_QML_PLUGIN(QtQmlMetaPlugin)
 
 #ifdef _WIN32
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+    Q_IMPORT_PLUGIN(QModernWindowsStylePlugin)
+#else
     Q_IMPORT_PLUGIN(QWindowsVistaStylePlugin)
+#endif
     Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
     Q_IMPORT_QML_PLUGIN(QtQuickControls2WindowsStylePlugin)
     Q_IMPORT_QML_PLUGIN(QtQuickControls2NativeStylePlugin)

modules/gui/qt/qt.cpp

@@ -780,11 +780,19 @@ static void *Thread( void *obj )
     Q_INIT_RESOURCE( qmake_QtQuick_Layouts );
     Q_INIT_RESOURCE( qmake_QtQuick_Templates );
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+    Q_INIT_RESOURCE( QuickControls2FusionStyleImpl_raw_qml_0 );
+    Q_INIT_RESOURCE( QuickControls2Fusion_raw_qml_0 );
+    Q_INIT_RESOURCE( qtquickcontrols2fusionstyle );
+    Q_INIT_RESOURCE( QuickControls2Basic_raw_qml_0 );
+    Q_INIT_RESOURCE( qtquickcontrols2basicstyle );
+#else
     Q_INIT_RESOURCE( qtquickcontrols2fusionstyleimplplugin_raw_qml_0 );
     Q_INIT_RESOURCE( qtquickcontrols2fusionstyleplugin_raw_qml_0 );
     Q_INIT_RESOURCE( qtquickcontrols2fusionstyle );
     Q_INIT_RESOURCE( qtquickcontrols2basicstyleplugin_raw_qml_0 );
     Q_INIT_RESOURCE( qtquickcontrols2basicstyleplugin );
+#endif
 
     Q_INIT_RESOURCE( qtgraphicaleffectsplugin_raw_qml_0 );
     Q_INIT_RESOURCE( qtgraphicaleffectsprivate_raw_qml_0 );

modules/gui/qt/util/audio_device_model.cpp

@@ -28,7 +28,7 @@ static void on_player_aout_device_changed(audio_output_t *,const char *device, v
     AudioDeviceModel* that = static_cast<AudioDeviceModel*>(data);
     QMetaObject::invokeMethod(that, [that, device=QString::fromUtf8(device)](){
         that->updateCurrent(device);
-    }, Qt::QueuedConnection, nullptr);
+    }, Qt::QueuedConnection);
 }
 
 }