CMake: Update to latest qml CMake API

Task-number: QTBUG-91621
Change-Id: I2a78d834580cddd08576f694ecd93bd5e19044f0
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

3 files changed, 68 insertions, 90 deletions

diff --git a/src/imports/graphicaleffects5/CMakeLists.txt b/src/imports/graphicaleffects5/CMakeLists.txt
index f3e6404..6de1b12 100644
--- a/src/imports/graphicaleffects5/CMakeLists.txt
+++ b/src/imports/graphicaleffects5/CMakeLists.txt
@@ -1,66 +1,7 @@
-# Generated from effects.pro.
-
 #####################################################################
 ## qtgraphicaleffectsplugin Plugin:
 #####################################################################
 
-qt_internal_add_qml_module(qtgraphicaleffectsplugin
-    URI "Qt5Compat.GraphicalEffects"
-    VERSION "${PROJECT_VERSION}"
-    DESIGNER_SUPPORTED
-    CLASSNAME QtGraphicalEffectsPlugin
-    DEPENDENCIES
-        Qt5Compat/GraphicalEffects/private/6.0
-        QtQuick.Window/2.1
-    SOURCES
-        plugin.cpp
-    PUBLIC_LIBRARIES
-        Qt::Qml
-        Qt::Quick
-)
-
-# Resources:
-set(qtgraphicaleffectsshaders_resource_files
-    "shaders_ng/brightnesscontrast.frag.qsb"
-    "shaders_ng/colorize.frag.qsb"
-    "shaders_ng/coloroverlay.frag.qsb"
-    "shaders_ng/conicalgradient_mask.frag.qsb"
-    "shaders_ng/conicalgradient_nomask.frag.qsb"
-    "shaders_ng/desaturate.frag.qsb"
-    "shaders_ng/displace.frag.qsb"
-    "shaders_ng/fastblur.frag.qsb"
-    "shaders_ng/fastblur_internal.frag.qsb"
-    "shaders_ng/fastblur_internal.vert.qsb"
-    "shaders_ng/fastglow.frag.qsb"
-    "shaders_ng/gammaadjust.frag.qsb"
-    "shaders_ng/huesaturation.frag.qsb"
-    "shaders_ng/leveladjust.frag.qsb"
-    "shaders_ng/lineargradient.vert.qsb"
-    "shaders_ng/lineargradient_mask.frag.qsb"
-    "shaders_ng/lineargradient_nomask.frag.qsb"
-    "shaders_ng/opacitymask.frag.qsb"
-    "shaders_ng/opacitymask_invert.frag.qsb"
-    "shaders_ng/radialgradient.vert.qsb"
-    "shaders_ng/radialgradient_mask.frag.qsb"
-    "shaders_ng/radialgradient_nomask.frag.qsb"
-    "shaders_ng/rectangularglow.frag.qsb"
-    "shaders_ng/thresholdmask.frag.qsb"
-)
-
-qt_internal_add_resource(qtgraphicaleffectsplugin "qtgraphicaleffectsshaders"
-    PREFIX
-        "/qt-project.org/imports/Qt5Compat/GraphicalEffects"
-    FILES
-        ${qtgraphicaleffectsshaders_resource_files}
-)
-
-
-#### Keys ignored in scope 2:.:.:effects_plugin.pro:<TRUE>:
-# CXX_MODULE = "qml"
-# IMPORT_VERSION = "1.$$QT_MINOR_VERSION"
-# QML_FILES = "BrightnessContrast.qml" "ColorOverlay.qml" "Colorize.qml" "ConicalGradient.qml" "Desaturate.qml" "Displace.qml" "DropShadow.qml" "FastBlur.qml" "GammaAdjust.qml" "Glow.qml" "HueSaturation.qml" "LevelAdjust.qml" "LinearGradient.qml" "OpacityMask.qml" "RadialGradient.qml" "RectangularGlow.qml" "ThresholdMask.qml"
-# TARGETPATH = "QtGraphicalEffects"
-
 set(qml_files
     "BrightnessContrast.qml"
     "ColorOverlay.qml"
@@ -132,9 +73,61 @@ set_source_files_properties(ThresholdMask.qml PROPERTIES
     QT_QML_SOURCE_VERSION "1.0"
 )
 
-qt6_target_qml_files(qtgraphicaleffectsplugin
-    FILES
+qt_internal_add_qml_module(qtgraphicaleffectsplugin
+    URI "Qt5Compat.GraphicalEffects"
+    VERSION "${PROJECT_VERSION}"
+    DESIGNER_SUPPORTED
+    CLASS_NAME QtGraphicalEffectsPlugin
+    PLUGIN_TARGET qtgraphicaleffectsplugin
+    NO_GENERATE_PLUGIN_SOURCE
+    NO_PLUGIN_OPTIONAL
+    NO_GENERATE_QMLTYPES
+    INSTALL_SOURCE_QMLTYPES "plugins.qmltypes"
+    DEPENDENCIES
+        Qt5Compat.GraphicalEffects.private
+        QtQuick.Window
+    SOURCES
+        plugin.cpp
+    QML_FILES
         ${qml_files}
+    PUBLIC_LIBRARIES
+        Qt::Qml
+        Qt::Quick
+)
+
+# Resources:
+set(qtgraphicaleffectsshaders_resource_files
+    "shaders_ng/brightnesscontrast.frag.qsb"
+    "shaders_ng/colorize.frag.qsb"
+    "shaders_ng/coloroverlay.frag.qsb"
+    "shaders_ng/conicalgradient_mask.frag.qsb"
+    "shaders_ng/conicalgradient_nomask.frag.qsb"
+    "shaders_ng/desaturate.frag.qsb"
+    "shaders_ng/displace.frag.qsb"
+    "shaders_ng/fastblur.frag.qsb"
+    "shaders_ng/fastblur_internal.frag.qsb"
+    "shaders_ng/fastblur_internal.vert.qsb"
+    "shaders_ng/fastglow.frag.qsb"
+    "shaders_ng/gammaadjust.frag.qsb"
+    "shaders_ng/huesaturation.frag.qsb"
+    "shaders_ng/leveladjust.frag.qsb"
+    "shaders_ng/lineargradient.vert.qsb"
+    "shaders_ng/lineargradient_mask.frag.qsb"
+    "shaders_ng/lineargradient_nomask.frag.qsb"
+    "shaders_ng/opacitymask.frag.qsb"
+    "shaders_ng/opacitymask_invert.frag.qsb"
+    "shaders_ng/radialgradient.vert.qsb"
+    "shaders_ng/radialgradient_mask.frag.qsb"
+    "shaders_ng/radialgradient_nomask.frag.qsb"
+    "shaders_ng/rectangularglow.frag.qsb"
+    "shaders_ng/thresholdmask.frag.qsb"
+)
+
+qt_internal_add_resource(qtgraphicaleffectsplugin "qtgraphicaleffectsshaders"
+    PREFIX
+        "/qt-project.org/imports/Qt5Compat/GraphicalEffects"
+    FILES
+        ${qtgraphicaleffectsshaders_resource_files}
 )
 qt_internal_add_docs(qtgraphicaleffectsplugin
     doc/qtgraphicaleffects5compat.qdocconf
diff --git a/src/imports/graphicaleffects5/private/CMakeLists.txt b/src/imports/graphicaleffects5/private/CMakeLists.txt
index d4f96ca..a0905b0 100644
--- a/src/imports/graphicaleffects5/private/CMakeLists.txt
+++ b/src/imports/graphicaleffects5/private/CMakeLists.txt
@@ -1,16 +1,27 @@
-# Generated from private.pro.
-
 #####################################################################
 ## qtgraphicaleffectsprivate Plugin:
 #####################################################################
 
+set(qml_files
+    "FastGlow.qml"
+)
+set_source_files_properties(FastGlow.qml PROPERTIES
+    QT_QML_SOURCE_VERSION "1.0"
+)
+
 qt_internal_add_qml_module(qtgraphicaleffectsprivate
     URI "Qt5Compat.GraphicalEffects.private"
     VERSION "${PROJECT_VERSION}"
-    CLASSNAME QtGraphicalEffectsPrivatePlugin
+    CLASS_NAME QtGraphicalEffectsPrivatePlugin
+    PLUGIN_TARGET qtgraphicaleffectsprivate
+    NO_GENERATE_PLUGIN_SOURCE
+    NO_PLUGIN_OPTIONAL
+    NO_GENERATE_QMLTYPES
     SOURCES
         plugin.cpp
         qgfxsourceproxy.cpp qgfxsourceproxy_p.h
+    QML_FILES
+        ${qml_files}
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::CorePrivate
@@ -21,24 +32,3 @@ qt_internal_add_qml_module(qtgraphicaleffectsprivate
         Qt::Quick
         Qt::QuickPrivate
 )
-
-#### Keys ignored in scope 1:.:.:private.pro:<TRUE>:
-# CXX_MODULE = "qml"
-# QML_FILES = "FastGlow.qml"
-# QML_IMPORT_VERSION = "$$QT_VERSION"
-# TARGETPATH = "QtGraphicalEffects/private"
-
-## Scopes:
-#####################################################################
-
-set(qml_files
-    "FastGlow.qml"
-)
-set_source_files_properties(FastGlow.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "1.0"
-)
-
-qt6_target_qml_files(qtgraphicaleffectsprivate
-    FILES
-        ${qml_files}
-)
diff --git a/src/imports/graphicaleffects5/private/qmldir b/src/imports/graphicaleffects5/private/qmldir
deleted file mode 100644
index 59b7101..0000000
--- a/src/imports/graphicaleffects5/private/qmldir
+++ /dev/null
@@ -1,5 +0,0 @@
-module Qt5Compat.GraphicalEffects.private
-plugin qtgraphicaleffectsprivate
-classname QtGraphicalEffectsPrivatePlugin
-typeinfo plugins.qmltypes
-FastGlow 1.0 FastGlow.qml