CMake: Update to latest qml CMake API

Task-number: QTBUG-91621
Change-Id: I0a096697f692378f8be7b942d06ee231c399319d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

7 files changed, 19 insertions, 111 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 31d4aee35..87f54a939 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,7 +8,6 @@ endif()
 # special case begin
 if(TARGET Qt::Quick)
     add_subdirectory(multimediaquick)
-    add_subdirectory(imports)
 endif()
 
 if(TARGET Qt::Widgets)
diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt
deleted file mode 100644
index 89124ca70..000000000
--- a/src/imports/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Generated from imports.pro.
-
-add_subdirectory(multimedia)
diff --git a/src/imports/multimedia/.prev_CMakeLists.txt b/src/imports/multimedia/.prev_CMakeLists.txt
deleted file mode 100644
index 8b4300a46..000000000
--- a/src/imports/multimedia/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-# Generated from multimedia.pro.
-
-#####################################################################
-## declarative_multimedia Plugin:
-#####################################################################
-
-qt_internal_add_qml_module(declarative_multimedia
-    URI "QtMultimedia"
-    VERSION "5.${CMAKE_PROJECT_VERSION_MINOR}"
-    CLASSNAME QMultimediaDeclarativeModule
-    SOURCES
-        multimedia.cpp
-        qdeclarativeaudio.cpp qdeclarativeaudio_p.h
-        qdeclarativecamera.cpp qdeclarativecamera_p.h
-        qdeclarativecameracapture.cpp qdeclarativecameracapture_p.h
-        qdeclarativecameraexposure.cpp qdeclarativecameraexposure_p.h
-        qdeclarativecameraflash.cpp qdeclarativecameraflash_p.h
-        qdeclarativecamerafocus.cpp qdeclarativecamerafocus_p.h
-        qdeclarativecameraimageprocessing.cpp qdeclarativecameraimageprocessing_p.h
-        qdeclarativecamerapreviewprovider.cpp qdeclarativecamerapreviewprovider_p.h
-        qdeclarativecamerarecorder.cpp qdeclarativecamerarecorder_p.h
-        qdeclarativecameraviewfinder.cpp qdeclarativecameraviewfinder_p.h
-        qdeclarativemediametadata_p.h
-        qdeclarativemultimediaglobal.cpp qdeclarativemultimediaglobal_p.h
-        qdeclarativeplaylist.cpp qdeclarativeplaylist_p.h
-        qdeclarativetorch.cpp qdeclarativetorch_p.h
-    DEFINES
-        QT_DISABLE_DEPRECATED_BEFORE=0
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::MultimediaPrivate
-        Qt::MultimediaQuickPrivate
-        Qt::Network
-        Qt::Qml
-        Qt::Quick
-)
-
-#### Keys ignored in scope 1:.:.:multimedia.pro:<TRUE>:
-# CXX_MODULE = "multimedia"
-# QML_FILES = "Video.qml"
-# QML_IMPORT_VERSION = "5.$$QT_MINOR_VERSION"
-# TARGETPATH = "QtMultimedia"
-
-set(qml_files
-    "Video.qml"
-)
-set_source_files_properties(Video.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "5.0"
-)
-
-qt6_target_qml_files(declarative_multimedia
-    FILES
-        ${qml_files}
-)
diff --git a/src/imports/multimedia/CMakeLists.txt b/src/imports/multimedia/CMakeLists.txt
deleted file mode 100644
index 4db0d6eee..000000000
--- a/src/imports/multimedia/CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-# Generated from multimedia.pro.
-
-#####################################################################
-## declarative_multimedia Plugin:
-#####################################################################
-
-qt_internal_add_qml_module(quickmultimedia
-    URI "QtMultimedia"
-    VERSION "${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}" # special case
-    CLASSNAME QMultimediaQuickModule
-    SOURCES
-        multimedia.cpp
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::MultimediaPrivate
-        Qt::MultimediaQuickPrivate
-        Qt::Network
-        Qt::Qml
-        Qt::Quick
-)
-
-#### Keys ignored in scope 1:.:.:multimedia.pro:<TRUE>:
-# CXX_MODULE = "multimedia"
-# QML_FILES = "Video.qml"
-# QML_IMPORT_VERSION = "5.$$QT_MINOR_VERSION"
-# TARGETPATH = "QtMultimedia"
-
-set(qml_files
-    "Video.qml"
-)
-set_source_files_properties(Video.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "5.0"
-)
-
-qt6_target_qml_files(quickmultimedia
-    FILES
-        ${qml_files}
-)
diff --git a/src/multimediaquick/CMakeLists.txt b/src/multimediaquick/CMakeLists.txt
index 8bc718f97..367911945 100644
--- a/src/multimediaquick/CMakeLists.txt
+++ b/src/multimediaquick/CMakeLists.txt
@@ -1,10 +1,22 @@
-# Generated from qtmultimediaquicktools.pro.
-
 #####################################################################
 ## MultimediaQuick Module:
 #####################################################################
 
-qt_internal_add_module(MultimediaQuick
+set(qml_files
+    "Video.qml"
+)
+set_source_files_properties(Video.qml PROPERTIES
+    QT_QML_SOURCE_VERSION "5.0"
+)
+
+qt_internal_add_qml_module(MultimediaQuick
+    URI "QtMultimedia"
+    VERSION "${PROJECT_VERSION}"
+    PAST_MAJOR_VERSIONS 5
+    CLASS_NAME QMultimediaQuickModule
+    PLUGIN_TARGET quickmultimedia
+    NO_GENERATE_PLUGIN_SOURCE
+    NO_PLUGIN_OPTIONAL
     CONFIG_MODULE_NAME multimediaquick
     INTERNAL_MODULE
     SOURCES
@@ -17,6 +29,8 @@ qt_internal_add_module(MultimediaQuick
         qsgvideotexture.cpp qsgvideotexture_p.h
         qtmultimediaquickglobal_p.h
         qtmultimediaquicktypes_p.h
+    QML_FILES
+        ${qml_files}
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::MultimediaPrivate
@@ -24,12 +38,4 @@ qt_internal_add_module(MultimediaQuick
         Qt::QuickPrivate
 )
 
-set_target_properties(MultimediaQuick PROPERTIES
-    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
-    QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION}
-    QT_QML_MODULE_URI QtMultimedia
-    QT_QMLTYPES_FILENAME plugins.qmltypes
-    QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtMultimedia"
-)
-
-qt6_qml_type_registration(MultimediaQuick)
+target_sources(quickmultimedia PRIVATE multimedia_plugin.cpp)
diff --git a/src/imports/multimedia/Video.qml b/src/multimediaquick/Video.qml
index 886f7ff9b..886f7ff9b 100644
--- a/src/imports/multimedia/Video.qml
+++ b/src/multimediaquick/Video.qml
diff --git a/src/imports/multimedia/multimedia.cpp b/src/multimediaquick/multimedia_plugin.cpp
index 2a5255ed7..f79ac7827 100644
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/multimediaquick/multimedia_plugin.cpp
@@ -74,5 +74,5 @@ public:
 
 QT_END_NAMESPACE
 
-#include "multimedia.moc"
+#include "multimedia_plugin.moc"