CMake: Update to latest qml CMake API

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

3 files changed, 18 insertions, 35 deletions

diff --git a/src/import/CMakeLists.txt b/src/import/CMakeLists.txt
index 3dc29c05..bf196b43 100644
--- a/src/import/CMakeLists.txt
+++ b/src/import/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from import.pro.
-
 #####################################################################
 ## qtquickvirtualkeyboardplugin Plugin:
 #####################################################################
@@ -7,7 +5,12 @@
 qt_internal_add_qml_module(qtquickvirtualkeyboardplugin
     URI "QtQuick.VirtualKeyboard"
     VERSION "2.${PROJECT_VERSION_MINOR}"
-    CLASSNAME QtQuickVirtualKeyboardPlugin
+    CLASS_NAME QtQuickVirtualKeyboardPlugin
+    PLUGIN_TARGET qtquickvirtualkeyboardplugin
+    NO_GENERATE_PLUGIN_SOURCE
+    NO_PLUGIN_OPTIONAL
+    NO_GENERATE_QMLTYPES
+    INSTALL_SOURCE_QMLTYPES "plugins.qmltypes"
     DEPENDENCIES
         QtQuick/2.0
         QtQuick.Window/2.2
@@ -15,7 +18,6 @@ qt_internal_add_qml_module(qtquickvirtualkeyboardplugin
         Qt.labs.folderlistmodel/2.1
         QtQuick.VirtualKeyboard.Settings/2.2
         QtQuick.VirtualKeyboard.Styles/2.2
-    SKIP_TYPE_REGISTRATION
     SOURCES
         qtquickvirtualkeyboardplugin.cpp qtquickvirtualkeyboardplugin.h
     PUBLIC_LIBRARIES
@@ -26,21 +28,9 @@ qt_internal_add_qml_module(qtquickvirtualkeyboardplugin
         Qt::VirtualKeyboardPrivate
 )
 
-#### Keys ignored in scope 1:.:.:import.pro:<TRUE>:
-# IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
-# OTHER_FILES = "dependencies.json" "plugins.qmltypes" "qmldir"
-# TARGETPATH = "QtQuick/VirtualKeyboard"
-
 ## Scopes:
 #####################################################################
 
 #### Keys ignored in scope 2:.:.:import.pro:WIN32:
 # QMAKE_TARGET_DESCRIPTION = "Virtual Keyboard for Qt."
 # QMAKE_TARGET_PRODUCT = "Qt Virtual Keyboard (Qt $$QT_VERSION)"
-
-#### Keys ignored in scope 3:.:.:import.pro:NOT CMAKE_CROSSCOMPILING AND ( build_pass OR NOT debug_and_release ):
-# QMAKE_EXTRA_TARGETS = "qmltypes"
-# qmltypes.commands = "$$QMPPLUGINDUMP_ENV" "$$QMLPLUGINDUMP" "-defaultplatform" "-nonrelocatable" "-dependencies" "$$PWD/dependencies.json" "QtQuick.VirtualKeyboard" "$$IMPORT_VERSION" ">" "$$PWD/plugins.qmltypes"
-
-#### Keys ignored in scope 4:.:.:import.pro:NOT WIN32:
-# QMPPLUGINDUMP_ENV = "QT_IM_MODULE=qtvirtualkeyboard"
diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt
index 5d381d82..4ed6bdcb 100644
--- a/src/settings/CMakeLists.txt
+++ b/src/settings/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from settings.pro.
-
 #####################################################################
 ## qtquickvirtualkeyboardsettingsplugin Plugin:
 #####################################################################
@@ -7,10 +5,14 @@
 qt_internal_add_qml_module(qtquickvirtualkeyboardsettingsplugin
     URI "QtQuick.VirtualKeyboard.Settings"
     VERSION "2.${PROJECT_VERSION_MINOR}"
-    CLASSNAME QtQuickVirtualKeyboardSettingsPlugin
+    CLASS_NAME QtQuickVirtualKeyboardSettingsPlugin
+    PLUGIN_TARGET qtquickvirtualkeyboardsettingsplugin
+    NO_GENERATE_PLUGIN_SOURCE
+    NO_PLUGIN_OPTIONAL
+    NO_GENERATE_QMLTYPES
+    INSTALL_SOURCE_QMLTYPES "plugins.qmltypes"
     DEPENDENCIES
         QtQuick/2.0
-    SKIP_TYPE_REGISTRATION
     SOURCES
         qtquickvirtualkeyboardsettingsplugin.cpp qtquickvirtualkeyboardsettingsplugin.h
     PUBLIC_LIBRARIES
@@ -21,11 +23,6 @@ qt_internal_add_qml_module(qtquickvirtualkeyboardsettingsplugin
         Qt::VirtualKeyboardPrivate
 )
 
-#### Keys ignored in scope 1:.:.:settings.pro:<TRUE>:
-# IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
-# OTHER_FILES = "plugins.qmltypes" "qmldir"
-# TARGETPATH = "QtQuick/VirtualKeyboard/Settings"
-
 ## Scopes:
 #####################################################################
 
diff --git a/src/styles/CMakeLists.txt b/src/styles/CMakeLists.txt
index 45218538..6dd88714 100644
--- a/src/styles/CMakeLists.txt
+++ b/src/styles/CMakeLists.txt
@@ -1,5 +1,3 @@
-# Generated from styles.pro.
-
 #####################################################################
 ## qtquickvirtualkeyboardstylesplugin Plugin:
 #####################################################################
@@ -7,10 +5,14 @@
 qt_internal_add_qml_module(qtquickvirtualkeyboardstylesplugin
     URI "QtQuick.VirtualKeyboard.Styles"
     VERSION "2.${PROJECT_VERSION_MINOR}"
-    CLASSNAME QtQuickVirtualKeyboardStylesPlugin
+    CLASS_NAME QtQuickVirtualKeyboardStylesPlugin
+    PLUGIN_TARGET qtquickvirtualkeyboardstylesplugin
+    NO_GENERATE_PLUGIN_SOURCE
+    NO_PLUGIN_OPTIONAL
+    NO_GENERATE_QMLTYPES
+    INSTALL_SOURCE_QMLTYPES "plugins.qmltypes"
     DEPENDENCIES
         QtQuick/2.0
-    SKIP_TYPE_REGISTRATION
     SOURCES
         qtquickvirtualkeyboardstylesplugin.cpp qtquickvirtualkeyboardstylesplugin.h
         svgimageprovider.cpp svgimageprovider.h
@@ -46,12 +48,6 @@ qt_internal_add_resource(qtquickvirtualkeyboardstylesplugin "styles"
         ${styles_resource_files}
 )
 
-
-#### Keys ignored in scope 1:.:.:styles.pro:<TRUE>:
-# IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
-# OTHER_FILES = "plugins.qmltypes" "qmldir"
-# TARGETPATH = "QtQuick/VirtualKeyboard/Styles"
-
 ## Scopes:
 #####################################################################