Regenerate qtdeclarative before merge

Change-Id: I5710110679220c4e22bc7f8b540f18a51b735ddf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot

48 files changed, 215 insertions, 127 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f3b6f296c1..c8a1d47654 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Generated from src.pro.
-
+# special case skip regeneration
 add_subdirectory(qml)
 add_subdirectory(qmlmodels)
 
diff --git a/src/imports/folderlistmodel/CMakeLists.txt b/src/imports/folderlistmodel/CMakeLists.txt
index 7fba885fd9..d9bb57c950 100644
--- a/src/imports/folderlistmodel/CMakeLists.txt
+++ b/src/imports/folderlistmodel/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qml_module(qmlfolderlistmodelplugin
     URI "Qt.labs.folderlistmodel"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QmlFolderListModelPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         fileinfothread.cpp fileinfothread_p.h
         fileproperty_p.h
diff --git a/src/imports/labsanimation/CMakeLists.txt b/src/imports/labsanimation/CMakeLists.txt
index 9e3768ad75..e0b322552e 100644
--- a/src/imports/labsanimation/CMakeLists.txt
+++ b/src/imports/labsanimation/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qml_module(labsanimationplugin
     URI "Qt.labs.animation"
     VERSION "1.0"
     CLASSNAME QtLabsAnimationPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/labsmodels/CMakeLists.txt b/src/imports/labsmodels/CMakeLists.txt
index 84e778843f..268120ffc1 100644
--- a/src/imports/labsmodels/CMakeLists.txt
+++ b/src/imports/labsmodels/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qml_module(labsmodelsplugin
     URI "Qt.labs.qmlmodels"
     VERSION "1.0"
     CLASSNAME QtQmlLabsModelsPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/layouts/CMakeLists.txt b/src/imports/layouts/CMakeLists.txt
index f75ec2eb9a..dbfefb239d 100644
--- a/src/imports/layouts/CMakeLists.txt
+++ b/src/imports/layouts/CMakeLists.txt
@@ -9,6 +9,7 @@ add_qml_module(qquicklayoutsplugin
     VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
     DESIGNER_SUPPORTED
     CLASSNAME QtQuickLayoutsPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
         qquickgridlayoutengine.cpp qquickgridlayoutengine_p.h
diff --git a/src/imports/localstorage/CMakeLists.txt b/src/imports/localstorage/CMakeLists.txt
index 2727b4dfa0..22ee1b947b 100644
--- a/src/imports/localstorage/CMakeLists.txt
+++ b/src/imports/localstorage/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qml_module(qmllocalstorageplugin
     URI "QtQuick.LocalStorage"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QQmlLocalStoragePlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/models/CMakeLists.txt b/src/imports/models/CMakeLists.txt
index 9b06e998c9..a7affed6e4 100644
--- a/src/imports/models/CMakeLists.txt
+++ b/src/imports/models/CMakeLists.txt
@@ -10,6 +10,7 @@ add_qml_module(modelsplugin
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
     DESIGNER_SUPPORTED
     CLASSNAME QtQmlModelsPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/particles/CMakeLists.txt b/src/imports/particles/CMakeLists.txt
index f519891b49..04fd522837 100644
--- a/src/imports/particles/CMakeLists.txt
+++ b/src/imports/particles/CMakeLists.txt
@@ -9,6 +9,7 @@ add_qml_module(particlesplugin
     URI "QtQuick.Particles"
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QtQuick2ParticlesPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/qtqml/.prev_CMakeLists.txt b/src/imports/qtqml/.prev_CMakeLists.txt
index 5e5be848bd..e8261aa5c7 100644
--- a/src/imports/qtqml/.prev_CMakeLists.txt
+++ b/src/imports/qtqml/.prev_CMakeLists.txt
@@ -12,6 +12,7 @@ add_qml_module(qmlplugin
     IMPORTS
         QtQml.Models
         QtQml.WorkerScript
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/qtqml/CMakeLists.txt b/src/imports/qtqml/CMakeLists.txt
index 855be1b62b..185116e6ce 100644
--- a/src/imports/qtqml/CMakeLists.txt
+++ b/src/imports/qtqml/CMakeLists.txt
@@ -12,6 +12,7 @@ add_qml_module(qmlplugin
     IMPORTS
         QtQml.Models
         QtQml.WorkerScript
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/qtquick2/CMakeLists.txt b/src/imports/qtquick2/CMakeLists.txt
index f9026d5774..f40864b8e0 100644
--- a/src/imports/qtquick2/CMakeLists.txt
+++ b/src/imports/qtquick2/CMakeLists.txt
@@ -12,6 +12,7 @@ add_qml_module(qtquick2plugin
     CLASSNAME QtQuick2Plugin
     IMPORTS
         QtQml
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/settings/CMakeLists.txt b/src/imports/settings/CMakeLists.txt
index f90b1a1040..57ab9efa89 100644
--- a/src/imports/settings/CMakeLists.txt
+++ b/src/imports/settings/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qml_module(qmlsettingsplugin
     URI "Qt.labs.settings"
     VERSION "1.1"
     CLASSNAME QmlSettingsPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
         qqmlsettings.cpp qqmlsettings_p.h
diff --git a/src/imports/shapes/CMakeLists.txt b/src/imports/shapes/CMakeLists.txt
index 9274fd14e7..c91c246ace 100644
--- a/src/imports/shapes/CMakeLists.txt
+++ b/src/imports/shapes/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qml_module(qmlshapesplugin
     URI "QtQuick.Shapes"
     VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QmlShapesPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/sharedimage/CMakeLists.txt b/src/imports/sharedimage/CMakeLists.txt
index 266faa6dc5..6dbf8f8ab7 100644
--- a/src/imports/sharedimage/CMakeLists.txt
+++ b/src/imports/sharedimage/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qml_module(sharedimageplugin
     URI "Qt.labs.sharedimage"
     VERSION "1.0"
     CLASSNAME QtQuickSharedImagePlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
         qsharedimageloader.cpp qsharedimageloader_p.h
diff --git a/src/imports/statemachine/CMakeLists.txt b/src/imports/statemachine/CMakeLists.txt
index 245c4aa681..f06fed1765 100644
--- a/src/imports/statemachine/CMakeLists.txt
+++ b/src/imports/statemachine/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qml_module(qtqmlstatemachine
     URI "QtQml.StateMachine"
     VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QtQmlStateMachinePlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         childrenprivate.h
         finalstate.cpp finalstate.h
diff --git a/src/imports/testlib/.prev_CMakeLists.txt b/src/imports/testlib/.prev_CMakeLists.txt
index 7674568e16..17cfcc34ec 100644
--- a/src/imports/testlib/.prev_CMakeLists.txt
+++ b/src/imports/testlib/.prev_CMakeLists.txt
@@ -39,12 +39,10 @@ set(qml_files
     "testlogger.js"
 )
 set_source_files_properties(TestCase.qml PROPERTIES
-    QT_QML_SOURCE_VERSION "1.2"
-    QT_QML_SOURCE_INSTALL TRUE
+    QT_QML_SOURCE_VERSION "1.0"
 )
 set_source_files_properties(SignalSpy.qml PROPERTIES
     QT_QML_SOURCE_VERSION "1.0"
-    QT_QML_SOURCE_INSTALL TRUE
 )
 
 qt6_target_qml_files(qmltestplugin
diff --git a/src/imports/testlib/CMakeLists.txt b/src/imports/testlib/CMakeLists.txt
index d5b5e821d8..b72e907fcb 100644
--- a/src/imports/testlib/CMakeLists.txt
+++ b/src/imports/testlib/CMakeLists.txt
@@ -40,11 +40,9 @@ set(qml_files
 )
 set_source_files_properties(TestCase.qml PROPERTIES
     QT_QML_SOURCE_VERSION "1.0"
-    QT_QML_SOURCE_INSTALL TRUE
 )
 set_source_files_properties(SignalSpy.qml PROPERTIES
     QT_QML_SOURCE_VERSION "1.0"
-    QT_QML_SOURCE_INSTALL TRUE
 )
 # special case begin
 set_source_files_properties(testlogger.js PROPERTIES
diff --git a/src/imports/wavefrontmesh/CMakeLists.txt b/src/imports/wavefrontmesh/CMakeLists.txt
index 8700cf9343..41a88305c7 100644
--- a/src/imports/wavefrontmesh/CMakeLists.txt
+++ b/src/imports/wavefrontmesh/CMakeLists.txt
@@ -8,6 +8,7 @@ add_qml_module(qmlwavefrontmeshplugin
     URI "Qt.labs.wavefrontmesh"
     VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}"
     CLASSNAME QmlWavefrontMeshPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
         qwavefrontmesh.cpp qwavefrontmesh.h
diff --git a/src/imports/window/CMakeLists.txt b/src/imports/window/CMakeLists.txt
index 3c42234360..9301f86038 100644
--- a/src/imports/window/CMakeLists.txt
+++ b/src/imports/window/CMakeLists.txt
@@ -10,6 +10,7 @@ add_qml_module(windowplugin
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
     DESIGNER_SUPPORTED
     CLASSNAME QtQuick2WindowPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/imports/workerscript/CMakeLists.txt b/src/imports/workerscript/CMakeLists.txt
index c17b76edc6..ae0da6de0c 100644
--- a/src/imports/workerscript/CMakeLists.txt
+++ b/src/imports/workerscript/CMakeLists.txt
@@ -10,6 +10,7 @@ add_qml_module(workerscriptplugin
     VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}"
     DESIGNER_SUPPORTED
     CLASSNAME QtQmlWorkerScriptPlugin
+    SKIP_TYPE_REGISTRATION
     SOURCES
         plugin.cpp
     LIBRARIES
diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt
index cdba8af06a..83e694d2df 100644
--- a/src/particles/CMakeLists.txt
+++ b/src/particles/CMakeLists.txt
@@ -5,6 +5,7 @@
 #####################################################################
 
 add_qt_module(QuickParticles
+    INTERNAL_MODULE
     SOURCES
         qquickage.cpp qquickage_p.h
         qquickangledirection.cpp qquickangledirection_p.h
@@ -52,26 +53,41 @@ add_qt_module(QuickParticles
 )
 
 # Resources:
-add_qt_resource(QuickParticles "particles" PREFIX "/" FILES
-    particleresources/fuzzydot.png
-    particleresources/glowdot.png
-    particleresources/noise.png
-    particleresources/star.png)
-add_qt_resource(QuickParticles "particles1" PREFIX "/particles" FILES
-    shaders/customparticle.frag
-    shaders/customparticle.vert
-    shaders/customparticle_core.frag
-    shaders/customparticle_core.vert
-    shaders/customparticletemplate.vert
-    shaders/customparticletemplate_core.vert
-    shaders/imageparticle.frag
-    shaders/imageparticle.vert
-    shaders/imageparticle_core.frag
-    shaders/imageparticle_core.vert)
+set(particles_resource_files
+    "particleresources/fuzzydot.png"
+    "particleresources/glowdot.png"
+    "particleresources/noise.png"
+    "particleresources/star.png"
+)
+
+add_qt_resource(QuickParticles "particles"
+    PREFIX
+        "/"
+    FILES
+        ${particles_resource_files}
+)
+set(particles1_resource_files
+    "shaders/customparticle.frag"
+    "shaders/customparticle.vert"
+    "shaders/customparticle_core.frag"
+    "shaders/customparticle_core.vert"
+    "shaders/customparticletemplate.vert"
+    "shaders/customparticletemplate_core.vert"
+    "shaders/imageparticle.frag"
+    "shaders/imageparticle.vert"
+    "shaders/imageparticle_core.frag"
+    "shaders/imageparticle_core.vert"
+)
+
+add_qt_resource(QuickParticles "particles1"
+    PREFIX
+        "/particles"
+    FILES
+        ${particles1_resource_files}
+)
 
 
 #### Keys ignored in scope 1:.:.:particles.pro:<TRUE>:
-# CONFIG = "internal_module"
 # MODULE = "quickparticles"
 # _LOADED = "qt_module"
 
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 805cddf62d..5e24a32791 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -1,10 +1,8 @@
 # Generated from plugins.pro.
 
-
-if(QT_FEATURE_thread AND QT_FEATURE_qml_debug)
+if(QT_FEATURE_qml_debug AND QT_FEATURE_thread)
     add_subdirectory(qmltooling)
 endif()
-
 if(TARGET Qt::Quick)
     add_subdirectory(scenegraph)
 endif()
diff --git a/src/plugins/qmltooling/packetprotocol/CMakeLists.txt b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt
index 16b70c455e..6e19d288a8 100644
--- a/src/plugins/qmltooling/packetprotocol/CMakeLists.txt
+++ b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt
@@ -18,5 +18,4 @@ add_qt_module(PacketProtocol
 )
 
 #### Keys ignored in scope 1:.:.:packetprotocol.pro:<TRUE>:
-# CONFIG = "static" "internal_module"
 # _LOADED = "qt_module"
diff --git a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
index b266f60b48..01c73e4919 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
@@ -28,6 +28,4 @@ add_qt_plugin(qmldbg_debugger
 
 #### Keys ignored in scope 1:.:.:qmldbg_debugger.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/qqmldebuggerservice.json"
-# PLUGIN_CLASS_NAME = "QQmlDebuggerServiceFactory"
-# PLUGIN_TYPE = "qmltooling"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
index f35337d0a0..cca4d0f793 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
@@ -30,6 +30,4 @@ add_qt_plugin(qmldbg_inspector
 
 #### Keys ignored in scope 1:.:.:qmldbg_inspector.pro:<TRUE>:
 # OTHER_FILES = "qqmlinspectorservice.json"
-# PLUGIN_CLASS_NAME = "QQmlInspectorServiceFactory"
-# PLUGIN_TYPE = "qmltooling"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
index b2fc767c0c..377616f059 100644
--- a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
@@ -18,6 +18,4 @@ add_qt_plugin(qmldbg_local
 
 #### Keys ignored in scope 1:.:.:qmldbg_local.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/qlocalclientconnection.json"
-# PLUGIN_CLASS_NAME = "QLocalClientConnectionFactory"
-# PLUGIN_TYPE = "qmltooling"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
index 0b512de34d..7e2d5df4cf 100644
--- a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
@@ -21,6 +21,4 @@ add_qt_plugin(qmldbg_messages
 
 #### Keys ignored in scope 1:.:.:qmldbg_messages.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/qdebugmessageservice.json"
-# PLUGIN_CLASS_NAME = "QDebugMessageServiceFactory"
-# PLUGIN_TYPE = "qmltooling"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
index c9a5577b20..4caa79ba22 100644
--- a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
@@ -21,6 +21,4 @@ add_qt_plugin(qmldbg_native
 
 #### Keys ignored in scope 1:.:.:qmldbg_native.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/qqmlnativedebugconnector.json"
-# PLUGIN_CLASS_NAME = "QQmlNativeDebugConnectorFactory"
-# PLUGIN_TYPE = "qmltooling"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
index 348f2b9386..a106e2f146 100644
--- a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
@@ -21,6 +21,4 @@ add_qt_plugin(qmldbg_nativedebugger
 
 #### Keys ignored in scope 1:.:.:qmldbg_nativedebugger.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/qqmlnativedebugservice.json"
-# PLUGIN_CLASS_NAME = "QQmlNativeDebugServiceFactory"
-# PLUGIN_TYPE = "qmltooling"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
index 50ab221372..f920c602fb 100644
--- a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
@@ -32,6 +32,4 @@ add_qt_plugin(qmldbg_preview
 
 #### Keys ignored in scope 1:.:.:qmldbg_preview.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/qqmlpreviewservice.json"
-# PLUGIN_CLASS_NAME = "QQmlPreviewServiceFactory"
-# PLUGIN_TYPE = "qmltooling"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
index 20b0e9803d..74999f219c 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
@@ -25,6 +25,4 @@ add_qt_plugin(qmldbg_profiler
 
 #### Keys ignored in scope 1:.:.:qmldbg_profiler.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/qqmlprofilerservice.json"
-# PLUGIN_CLASS_NAME = "QQmlProfilerServiceFactory"
-# PLUGIN_TYPE = "qmltooling"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
index d18b0eb3e0..ad88af46bb 100644
--- a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
@@ -25,6 +25,4 @@ add_qt_plugin(qmldbg_quickprofiler
 
 #### Keys ignored in scope 1:.:.:qmldbg_quickprofiler.pro:<TRUE>:
 # OTHER_FILES = "qquickprofileradapter.json"
-# PLUGIN_CLASS_NAME = "QQuickProfilerAdapterFactory"
-# PLUGIN_TYPE = "qmltooling"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
index 9d9fb49a1f..30045f9fa3 100644
--- a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
@@ -20,6 +20,4 @@ add_qt_plugin(qmldbg_server
 
 #### Keys ignored in scope 1:.:.:qmldbg_server.pro:<TRUE>:
 # OTHER_FILES = "qqmldebugserver.json"
-# PLUGIN_CLASS_NAME = "QQmlDebugServerFactory"
-# PLUGIN_TYPE = "qmltooling"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
index 9654a38aba..04cfcddc8e 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
@@ -19,6 +19,4 @@ add_qt_plugin(qmldbg_tcp
 
 #### Keys ignored in scope 1:.:.:qmldbg_tcp.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/qtcpserverconnection.json"
-# PLUGIN_CLASS_NAME = "QTcpServerConnectionFactory"
-# PLUGIN_TYPE = "qmltooling"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/scenegraph/.prev_CMakeLists.txt b/src/plugins/scenegraph/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..b41ceed2b8
--- /dev/null
+++ b/src/plugins/scenegraph/.prev_CMakeLists.txt
@@ -0,0 +1,8 @@
+# Generated from scenegraph.pro.
+
+if(QT_FEATURE_d3d12)
+    add_subdirectory(d3d12)
+endif()
+if(QT_FEATURE_openvg)
+    add_subdirectory(openvg)
+endif()
diff --git a/src/plugins/scenegraph/CMakeLists.txt b/src/plugins/scenegraph/CMakeLists.txt
index c490b19293..364c38bc8b 100644
--- a/src/plugins/scenegraph/CMakeLists.txt
+++ b/src/plugins/scenegraph/CMakeLists.txt
@@ -1,9 +1,10 @@
 # Generated from scenegraph.pro.
 
-
+# special case begin
 #if(QT_FEATURE_d3d12)
 #    add_subdirectory(d3d12)
 #endif()
+# special case end
 
 if(QT_FEATURE_openvg)
     add_subdirectory(openvg)
diff --git a/src/plugins/scenegraph/openvg/CMakeLists.txt b/src/plugins/scenegraph/openvg/CMakeLists.txt
index 39e28e047c..f1d5e45644 100644
--- a/src/plugins/scenegraph/openvg/CMakeLists.txt
+++ b/src/plugins/scenegraph/openvg/CMakeLists.txt
@@ -40,10 +40,7 @@ add_qt_plugin(qsgopenvgbackend
 )
 
 #### Keys ignored in scope 1:.:.:openvg.pro:<TRUE>:
-# CONFIG = "egl"
 # OTHER_FILES = "$$PWD/openvg.json"
-# PLUGIN_CLASS_NAME = "QSGOpenVGAdaptation"
-# PLUGIN_TYPE = "scenegraph"
 # QMAKE_TARGET_DESCRIPTION = "Quick OpenVG Renderer for Qt."
 # QMAKE_TARGET_PRODUCT = "Qt Quick OpenVG Renderer (Qt $$QT_VERSION)"
 # _LOADED = "qt_plugin"
diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt
index dbebb9a0ba..bbe31482e4 100644
--- a/src/qml/.prev_CMakeLists.txt
+++ b/src/qml/.prev_CMakeLists.txt
@@ -172,7 +172,7 @@ add_qt_module(Qml
         parser/qqmljsast.cpp parser/qqmljsast_p.h
         parser/qqmljsastfwd_p.h
         parser/qqmljsastvisitor.cpp parser/qqmljsastvisitor_p.h
-        parser/qqmljsengine_p.cpp parser/qqmljsengine_p.h parser/qqmljsengine_p.h
+        parser/qqmljsengine_p.cpp parser/qqmljsengine_p.h
         parser/qqmljsglobal_p.h
         parser/qqmljskeywords_p.h
         parser/qqmljslexer.cpp parser/qqmljslexer_p.h
@@ -328,9 +328,14 @@ add_qt_module(Qml
         Qt::Core
 )
 
+# QLALR Grammars:
+qt_process_qlalr(
+    parser/qqmljs.g
+    Qml
+    ""
+)
+
 #### Keys ignored in scope 1:.:.:qml.pro:<TRUE>:
-# CONFIG = "qt_tracepoints" "qlalr"
-# MODULE_PLUGIN_TYPES = "qmltooling"
 # _LOADED = "qt_module"
 
 ## Scopes:
@@ -385,7 +390,7 @@ extend_target(Qml CONDITION release AND MSVC AND QT_CL_MAJOR_VERSION___equals___
 #### Keys ignored in scope 10:.:.:qml.pro:ICC:
 # WERROR = "-ww2415"
 
-#### Keys ignored in scope 11:.:.:qml.pro:greaterThan(QT_CLANG_MAJOR_VERSION,3) OR greaterThan(QT_CLANG_MINOR_VERSION,3) OR greaterThan(QT_APPLE_CLANG_MAJOR_VERSION,5) OR QT_APPLE_CLANG_MAJOR_VERSION___equals___5 AND greaterThan(QT_APPLE_CLANG_MINOR_VERSION,0):
+#### Keys ignored in scope 11:.:.:qml.pro:greaterThan(QT_CLANG_MAJOR_VERSION,3) OR greaterThan(QT_CLANG_MINOR_VERSION,3) OR greaterThan(QT_APPLE_CLANG_MAJOR_VERSION,5) OR ( QT_APPLE_CLANG_MAJOR_VERSION___equals___5 AND greaterThan(QT_APPLE_CLANG_MINOR_VERSION,0) ):
 # WERROR = "-Wno-error=unused-const-variable"
 
 extend_target(Qml CONDITION QT_FEATURE_qml_jit
@@ -419,16 +424,16 @@ extend_target(Qml CONDITION QT_FEATURE_qml_animation
 
 #### Keys ignored in scope 18:.:common:common/common.pri:EXISTS _ss_tagFile:
 # QMAKE_INTERNAL_INCLUDED_FILES = "$$tagFile"
-# tag = "$$cat$$tagFile,singleline"
+# tag = "$$cat($$tagFile, singleline)"
 
 #### Keys ignored in scope 19:.:common:common/common.pri:NOT tag___equals____ss_{LITERAL_DOLLAR}Format AND %H_ss_{LITERAL_DOLLAR}:
 # QML_COMPILE_HASH = "$$tag"
 
 #### Keys ignored in scope 21:.:common:common/common.pri:EXISTS _ss_PWD/../../.git:
 # QML_COMPILE_HASH = "$$commit"
-# commit = "$$systemgitrev-parseHEAD"
+# commit = "$$system(git rev-parse HEAD)"
 
-extend_target(Qml CONDITION (GCC) AND ((QT_COMPILER_VERSION_MAJOR STREQUAL 5))
+extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
     COMPILE_OPTIONS
         -fno-strict-aliasing
 )
@@ -498,7 +503,7 @@ extend_target(Qml CONDITION QT_FEATURE_qml_locale
         qml/qqmllocale.cpp qml/qqmllocale_p.h
 )
 
-extend_target(Qml CONDITION QT_FEATURE_clock_gettime AND linux-_x_ OR hpux-_x_ OR solaris-_x_
+extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_)
     LIBRARIES
         rt
 )
@@ -508,7 +513,7 @@ extend_target(Qml CONDITION QT_FEATURE_qml_itemmodel
         types/qqmlmodelindexvaluetype.cpp types/qqmlmodelindexvaluetype_p.h
 )
 
-extend_target(Qml CONDITION (disassembler) AND ((TEST_architecture_arch STREQUAL "i386")" OR isEqual(QT_ARCH,"x86_64))
+extend_target(Qml CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
     DEFINES
         WTF_USE_UDIS86=1
 )
@@ -533,12 +538,12 @@ extend_target(Qml CONDITION NOT disassembler
         WTF_USE_UDIS86=0
 )
 
-extend_target(Qml CONDITION (CMAKE_BUILD_TYPE STREQUAL Release)
+extend_target(Qml CONDITION CMAKE_BUILD_TYPE STREQUAL Release
     DEFINES
         NDEBUG
 )
 
-extend_target(Qml CONDITION (NOT ICC AND NOT CLANG AND GCC) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 6))
+extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
     COMPILE_OPTIONS
         -Wno-expansion-to-defined
 )
@@ -602,7 +607,7 @@ extend_target(Qml CONDITION (((NOT c++11 AND NOT ICC) AND (NOT (CLANG))) AND (GC
 
 
 qt_create_tracepoints(Qml qtqml.tracepoints)
-add_qt_docs(
+add_qt_docs(Qml
     doc/qtqml.qdocconf
 )
 
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index f83f98ed3a..cae2a55e41 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -172,7 +172,7 @@ add_qt_module(Qml
         parser/qqmljsast.cpp parser/qqmljsast_p.h
         parser/qqmljsastfwd_p.h
         parser/qqmljsastvisitor.cpp parser/qqmljsastvisitor_p.h
-        parser/qqmljsengine_p.cpp parser/qqmljsengine_p.h parser/qqmljsengine_p.h
+        parser/qqmljsengine_p.cpp parser/qqmljsengine_p.h
         parser/qqmljsglobal_p.h
         parser/qqmljskeywords_p.h
         parser/qqmljslexer.cpp parser/qqmljslexer_p.h
@@ -328,9 +328,16 @@ add_qt_module(Qml
         Qt::Core
 )
 
+# special case begin remove the block, handled manually
+# QLALR Grammars:
+#qt_process_qlalr(
+#    parser/qqmljs.g
+#    Qml
+#    ""
+#)
+# special case end
+
 #### Keys ignored in scope 1:.:.:qml.pro:<TRUE>:
-# CONFIG = "qt_tracepoints" "qlalr"
-# MODULE_PLUGIN_TYPES = "qmltooling"
 # _LOADED = "qt_module"
 
 # special case begin
@@ -392,7 +399,7 @@ extend_target(Qml CONDITION release AND MSVC AND QT_CL_MAJOR_VERSION___equals___
 #### Keys ignored in scope 10:.:.:qml.pro:ICC:
 # WERROR = "-ww2415"
 
-#### Keys ignored in scope 11:.:.:qml.pro:greaterThan(QT_CLANG_MAJOR_VERSION,3) OR greaterThan(QT_CLANG_MINOR_VERSION,3) OR greaterThan(QT_APPLE_CLANG_MAJOR_VERSION,5) OR QT_APPLE_CLANG_MAJOR_VERSION___equals___5 AND greaterThan(QT_APPLE_CLANG_MINOR_VERSION,0):
+#### Keys ignored in scope 11:.:.:qml.pro:greaterThan(QT_CLANG_MAJOR_VERSION,3) OR greaterThan(QT_CLANG_MINOR_VERSION,3) OR greaterThan(QT_APPLE_CLANG_MAJOR_VERSION,5) OR ( QT_APPLE_CLANG_MAJOR_VERSION___equals___5 AND greaterThan(QT_APPLE_CLANG_MINOR_VERSION,0) ):
 # WERROR = "-Wno-error=unused-const-variable"
 
 extend_target(Qml CONDITION QT_FEATURE_qml_jit
@@ -426,16 +433,16 @@ extend_target(Qml CONDITION QT_FEATURE_qml_animation
 
 #### Keys ignored in scope 18:.:common:common/common.pri:EXISTS _ss_tagFile:
 # QMAKE_INTERNAL_INCLUDED_FILES = "$$tagFile"
-# tag = "$$cat$$tagFile,singleline"
+# tag = "$$cat($$tagFile, singleline)"
 
 #### Keys ignored in scope 19:.:common:common/common.pri:NOT tag___equals____ss_{LITERAL_DOLLAR}Format AND %H_ss_{LITERAL_DOLLAR}:
 # QML_COMPILE_HASH = "$$tag"
 
 #### Keys ignored in scope 21:.:common:common/common.pri:EXISTS _ss_PWD/../../.git:
 # QML_COMPILE_HASH = "$$commit"
-# commit = "$$systemgitrev-parseHEAD"
+# commit = "$$system(git rev-parse HEAD)"
 
-extend_target(Qml CONDITION (GCC) AND ((QT_COMPILER_VERSION_MAJOR STREQUAL 5))
+extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
     COMPILE_OPTIONS
         -fno-strict-aliasing
 )
@@ -505,7 +512,7 @@ extend_target(Qml CONDITION QT_FEATURE_qml_locale
         qml/qqmllocale.cpp qml/qqmllocale_p.h
 )
 
-extend_target(Qml CONDITION QT_FEATURE_clock_gettime AND linux-_x_ OR hpux-_x_ OR solaris-_x_
+extend_target(Qml CONDITION hpux-_x_ OR solaris-_x_ OR (QT_FEATURE_clock_gettime AND linux-_x_)
     LIBRARIES
         rt
 )
@@ -515,7 +522,7 @@ extend_target(Qml CONDITION QT_FEATURE_qml_itemmodel
         types/qqmlmodelindexvaluetype.cpp types/qqmlmodelindexvaluetype_p.h
 )
 
-extend_target(Qml CONDITION (disassembler) AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) # special case
+extend_target(Qml CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
     DEFINES
         WTF_USE_UDIS86=1
 )
@@ -540,12 +547,12 @@ extend_target(Qml CONDITION NOT disassembler
         WTF_USE_UDIS86=0
 )
 
-extend_target(Qml CONDITION (CMAKE_BUILD_TYPE STREQUAL Release)
+extend_target(Qml CONDITION CMAKE_BUILD_TYPE STREQUAL Release
     DEFINES
         NDEBUG
 )
 
-extend_target(Qml CONDITION (NOT ICC AND NOT CLANG AND GCC) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 6))
+extend_target(Qml CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
     COMPILE_OPTIONS
         -Wno-expansion-to-defined
 )
@@ -609,7 +616,7 @@ extend_target(Qml CONDITION (((NOT c++11 AND NOT ICC) AND (NOT (CLANG))) AND (GC
 
 
 qt_create_tracepoints(Qml qtqml.tracepoints)
-add_qt_docs(
+add_qt_docs(Qml
     doc/qtqml.qdocconf
 )
 
diff --git a/src/qmldebug/CMakeLists.txt b/src/qmldebug/CMakeLists.txt
index 60f44769f2..1972c6b796 100644
--- a/src/qmldebug/CMakeLists.txt
+++ b/src/qmldebug/CMakeLists.txt
@@ -6,6 +6,7 @@
 
 add_qt_module(QmlDebug
     STATIC
+    INTERNAL_MODULE
     SOURCES
         qqmldebugclient.cpp qqmldebugclient_p.h
         qqmldebugclient_p_p.h
@@ -39,5 +40,4 @@ add_qt_module(QmlDebug
 )
 
 #### Keys ignored in scope 1:.:.:qmldebug.pro:<TRUE>:
-# CONFIG = "static" "internal_module"
 # _LOADED = "qt_module"
diff --git a/src/qmldevtools/.prev_CMakeLists.txt b/src/qmldevtools/.prev_CMakeLists.txt
index 6e229f7d80..23bc696917 100644
--- a/src/qmldevtools/.prev_CMakeLists.txt
+++ b/src/qmldevtools/.prev_CMakeLists.txt
@@ -32,7 +32,7 @@ add_qt_module(QmlDevTools
         ../qml/parser/qqmljsast.cpp ../qml/parser/qqmljsast_p.h
         ../qml/parser/qqmljsastfwd_p.h
         ../qml/parser/qqmljsastvisitor.cpp ../qml/parser/qqmljsastvisitor_p.h
-        ../qml/parser/qqmljsengine_p.cpp ../qml/parser/qqmljsengine_p.h ../qml/parser/qqmljsengine_p.h
+        ../qml/parser/qqmljsengine_p.cpp ../qml/parser/qqmljsengine_p.h
         ../qml/parser/qqmljsglobal_p.h
         ../qml/parser/qqmljskeywords_p.h
         ../qml/parser/qqmljslexer.cpp ../qml/parser/qqmljslexer_p.h
@@ -50,8 +50,14 @@ add_qt_module(QmlDevTools
         Qt::Core
 )
 
+# QLALR Grammars:
+qt_process_qlalr(
+    ../qml/parser/qqmljs.g
+    QmlDevTools
+    ""
+)
+
 #### Keys ignored in scope 1:.:.:qmldevtools.pro:<TRUE>:
-# CONFIG = "minimal_syncqt" "internal_module" "generated_privates" "qlalr"
 # MODULE_INCNAME = "QtQml"
 # _LOADED = "qt_module"
 # _OPTION = "host_build"
@@ -62,7 +68,7 @@ add_qt_module(QmlDevTools
 #### Keys ignored in scope 2:.:.:qmldevtools.pro:ICC:
 # WERROR = "-ww2415"
 
-#### Keys ignored in scope 3:.:.:qmldevtools.pro:CLANG AND greaterThan(QT_CLANG_MAJOR_VERSION,3 OR greaterThan(QT_CLANG_MINOR_VERSION,3)):
+#### Keys ignored in scope 3:.:.:qmldevtools.pro:CLANG AND ( greaterThan(QT_CLANG_MAJOR_VERSION,3) OR greaterThan(QT_CLANG_MINOR_VERSION,3) ):
 # WERROR = "-Wno-error=unused-const-variable"
 
 #### Keys ignored in scope 5:.:../qml/common:../qml/common/common.pri:NOT build_pass:
@@ -72,16 +78,16 @@ add_qt_module(QmlDevTools
 
 #### Keys ignored in scope 6:.:../qml/common:../qml/common/common.pri:EXISTS _ss_tagFile:
 # QMAKE_INTERNAL_INCLUDED_FILES = "$$tagFile"
-# tag = "$$cat$$tagFile,singleline"
+# tag = "$$cat($$tagFile, singleline)"
 
 #### Keys ignored in scope 7:.:../qml/common:../qml/common/common.pri:NOT tag___equals____ss_{LITERAL_DOLLAR}Format AND %H_ss_{LITERAL_DOLLAR}:
 # QML_COMPILE_HASH = "$$tag"
 
 #### Keys ignored in scope 9:.:../qml/common:../qml/common/common.pri:EXISTS _ss_PWD/../../.git:
 # QML_COMPILE_HASH = "$$commit"
-# commit = "$$systemgitrev-parseHEAD"
+# commit = "$$system(git rev-parse HEAD)"
 
-extend_target(QmlDevTools CONDITION (GCC) AND ((QT_COMPILER_VERSION_MAJOR STREQUAL 5))
+extend_target(QmlDevTools CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
     COMPILE_OPTIONS
         -fno-strict-aliasing
 )
diff --git a/src/qmldevtools/CMakeLists.txt b/src/qmldevtools/CMakeLists.txt
index 522fb3689c..8a336a9ca5 100644
--- a/src/qmldevtools/CMakeLists.txt
+++ b/src/qmldevtools/CMakeLists.txt
@@ -32,7 +32,7 @@ add_qt_module(QmlDevTools
         ../qml/parser/qqmljsast.cpp ../qml/parser/qqmljsast_p.h
         ../qml/parser/qqmljsastfwd_p.h
         ../qml/parser/qqmljsastvisitor.cpp ../qml/parser/qqmljsastvisitor_p.h
-        ../qml/parser/qqmljsengine_p.cpp ../qml/parser/qqmljsengine_p.h ../qml/parser/qqmljsengine_p.h
+        ../qml/parser/qqmljsengine_p.cpp ../qml/parser/qqmljsengine_p.h
         ../qml/parser/qqmljsglobal_p.h
         ../qml/parser/qqmljskeywords_p.h
         ../qml/parser/qqmljslexer.cpp ../qml/parser/qqmljslexer_p.h
@@ -86,7 +86,6 @@ add_dependencies(QmlDevTools Qml)
 # special case end
 
 #### Keys ignored in scope 1:.:.:qmldevtools.pro:<TRUE>:
-# CONFIG = "minimal_syncqt" "internal_module" "generated_privates" "qlalr"
 # MODULE_INCNAME = "QtQml"
 # _LOADED = "qt_module"
 # _OPTION = "host_build"
@@ -97,7 +96,7 @@ add_dependencies(QmlDevTools Qml)
 #### Keys ignored in scope 2:.:.:qmldevtools.pro:ICC:
 # WERROR = "-ww2415"
 
-#### Keys ignored in scope 3:.:.:qmldevtools.pro:CLANG AND greaterThan(QT_CLANG_MAJOR_VERSION,3 OR greaterThan(QT_CLANG_MINOR_VERSION,3)):
+#### Keys ignored in scope 3:.:.:qmldevtools.pro:CLANG AND ( greaterThan(QT_CLANG_MAJOR_VERSION,3) OR greaterThan(QT_CLANG_MINOR_VERSION,3) ):
 # WERROR = "-Wno-error=unused-const-variable"
 
 #### Keys ignored in scope 5:.:../qml/common:../qml/common/common.pri:NOT build_pass:
@@ -107,16 +106,16 @@ add_dependencies(QmlDevTools Qml)
 
 #### Keys ignored in scope 6:.:../qml/common:../qml/common/common.pri:EXISTS _ss_tagFile:
 # QMAKE_INTERNAL_INCLUDED_FILES = "$$tagFile"
-# tag = "$$cat$$tagFile,singleline"
+# tag = "$$cat($$tagFile, singleline)"
 
 #### Keys ignored in scope 7:.:../qml/common:../qml/common/common.pri:NOT tag___equals____ss_{LITERAL_DOLLAR}Format AND %H_ss_{LITERAL_DOLLAR}:
 # QML_COMPILE_HASH = "$$tag"
 
 #### Keys ignored in scope 9:.:../qml/common:../qml/common/common.pri:EXISTS _ss_PWD/../../.git:
 # QML_COMPILE_HASH = "$$commit"
-# commit = "$$systemgitrev-parseHEAD"
+# commit = "$$system(git rev-parse HEAD)"
 
-extend_target(QmlDevTools CONDITION (GCC) AND ((QT_COMPILER_VERSION_MAJOR STREQUAL 5))
+extend_target(QmlDevTools CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STREQUAL 5
     COMPILE_OPTIONS
         -fno-strict-aliasing
 )
diff --git a/src/qmltest/.prev_CMakeLists.txt b/src/qmltest/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..0661a38709
--- /dev/null
+++ b/src/qmltest/.prev_CMakeLists.txt
@@ -0,0 +1,52 @@
+# Generated from qmltest.pro.
+
+#####################################################################
+## QuickTest Module:
+#####################################################################
+
+add_qt_module(QuickTest
+    QMAKE_MODULE_CONFIG $${QT.testlib.CONFIG}
+    SOURCES
+        qtestoptions_p.h
+        quicktest.cpp quicktest.h
+        quicktestevent.cpp quicktestevent_p.h
+        quicktestglobal.h
+        quicktestresult.cpp quicktestresult_p.h
+    DEFINES
+        QT_NO_FOREACH
+        QT_NO_URL_CAST_FROM_STRING
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::Quick
+        Qt::QuickPrivate
+        Qt::TestPrivate
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qmltest.pro:<TRUE>:
+# MODULE_CONFIG = "$${QT.testlib.CONFIG}"
+# _LOADED = "qt_module"
+
+## Scopes:
+#####################################################################
+
+extend_target(QuickTest CONDITION TARGET Qt::Widgets
+    DEFINES
+        QT_QMLTEST_WITH_WIDGETS
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+)
+
+extend_target(QuickTest CONDITION QT_FEATURE_qml_debug
+    DEFINES
+        QT_QML_DEBUG_NO_WARNING
+)
+add_qt_docs(QuickTest
+    doc/qtqmltest.qdocconf
+)
+
diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt
index b42f0aa552..55438e1ff4 100644
--- a/src/qmltest/CMakeLists.txt
+++ b/src/qmltest/CMakeLists.txt
@@ -17,10 +17,13 @@ add_qt_module(QuickTest
         QT_NO_URL_CAST_FROM_STRING
         QT_BUILD_QMLTEST_LIB # special case
     LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::QmlPrivate
+        Qt::Quick
+        Qt::QuickPrivate
         Qt::TestPrivate
-        Qt::Quick # special case
-        Qt::QuickPrivate # special case
-        Qt::QmlPrivate # special case
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Test
@@ -28,7 +31,6 @@ add_qt_module(QuickTest
 
 #### Keys ignored in scope 1:.:.:qmltest.pro:<TRUE>:
 # MODULE_CONFIG = "$${QT.testlib.CONFIG}"
-# QT_PRIVATE = "quick" "quick-private" "qml-private" "gui" "core-private" "gui-private"
 # _LOADED = "qt_module"
 
 ## Scopes:
@@ -45,6 +47,7 @@ extend_target(QuickTest CONDITION QT_FEATURE_qml_debug
     DEFINES
         QT_QML_DEBUG_NO_WARNING
 )
-add_qt_docs(
+add_qt_docs(QuickTest
     doc/qtqmltest.qdocconf
 )
+
diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt
index 7289ad9d11..51b6df5ea3 100644
--- a/src/qmlworkerscript/.prev_CMakeLists.txt
+++ b/src/qmlworkerscript/.prev_CMakeLists.txt
@@ -56,7 +56,7 @@ extend_target(QmlWorkerScript CONDITION WIN32
         NOMINMAX
 )
 
-extend_target(QmlWorkerScript CONDITION (disassembler) AND ((TEST_architecture_arch STREQUAL "i386")" OR isEqual(QT_ARCH,"x86_64))
+extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
     DEFINES
         WTF_USE_UDIS86=1
 )
@@ -81,12 +81,12 @@ extend_target(QmlWorkerScript CONDITION NOT disassembler
         WTF_USE_UDIS86=0
 )
 
-extend_target(QmlWorkerScript CONDITION (CMAKE_BUILD_TYPE STREQUAL Release)
+extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release
     DEFINES
         NDEBUG
 )
 
-extend_target(QmlWorkerScript CONDITION (NOT ICC AND NOT CLANG AND GCC) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 6))
+extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
     COMPILE_OPTIONS
         -Wno-expansion-to-defined
 )
diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt
index 4c8aa17f59..9abfb586ba 100644
--- a/src/qmlworkerscript/CMakeLists.txt
+++ b/src/qmlworkerscript/CMakeLists.txt
@@ -56,7 +56,7 @@ extend_target(QmlWorkerScript CONDITION WIN32
         NOMINMAX
 )
 
-extend_target(QmlWorkerScript CONDITION (disassembler) AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) # special case
+extend_target(QmlWorkerScript CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
     DEFINES
         WTF_USE_UDIS86=1
 )
@@ -81,12 +81,12 @@ extend_target(QmlWorkerScript CONDITION NOT disassembler
         WTF_USE_UDIS86=0
 )
 
-extend_target(QmlWorkerScript CONDITION (CMAKE_BUILD_TYPE STREQUAL Release)
+extend_target(QmlWorkerScript CONDITION CMAKE_BUILD_TYPE STREQUAL Release
     DEFINES
         NDEBUG
 )
 
-extend_target(QmlWorkerScript CONDITION (NOT ICC AND NOT CLANG AND GCC) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 6))
+extend_target(QmlWorkerScript CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
     COMPILE_OPTIONS
         -Wno-expansion-to-defined
 )
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index 2cdcee56a1..dd04fa598c 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -347,7 +347,6 @@ if(ANDROID)
 endif()
 
 #### Keys ignored in scope 1:.:.:quick.pro:<TRUE>:
-# MODULE_PLUGIN_TYPES = "scenegraph"
 # _LOADED = "qt_module"
 
 ## Scopes:
@@ -584,7 +583,7 @@ extend_target(Quick CONDITION QT_FEATURE_wheelevent
         handlers/qquickwheelhandler.cpp handlers/qquickwheelhandler_p.h
         handlers/qquickwheelhandler_p_p.h
 )
-add_qt_docs(
+add_qt_docs(Quick
     doc/qtquick.qdocconf
 )
 
diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt
index 9c13042db8..661ba534fa 100644
--- a/src/quickshapes/CMakeLists.txt
+++ b/src/quickshapes/CMakeLists.txt
@@ -23,33 +23,40 @@ add_qt_module(QuickShapes
 )
 
 # Resources:
-add_qt_resource(QuickShapes "qtquickshapes" PREFIX "/qt-project.org/shapes" FILES
-    shaders/blit.frag
-    shaders/blit.vert
-    shaders/blit_core.frag
-    shaders/blit_core.vert
-    shaders/conicalgradient.frag
-    shaders/conicalgradient.vert
-    shaders/conicalgradient_core.frag
-    shaders/conicalgradient_core.vert
-    shaders/lineargradient.frag
-    shaders/lineargradient.vert
-    shaders/lineargradient_core.frag
-    shaders/lineargradient_core.vert
-    shaders/radialgradient.frag
-    shaders/radialgradient.vert
-    shaders/radialgradient_core.frag
-    shaders/radialgradient_core.vert
-    shaders_ng/conicalgradient.frag.qsb
-    shaders_ng/conicalgradient.vert.qsb
-    shaders_ng/lineargradient.frag.qsb
-    shaders_ng/lineargradient.vert.qsb
-    shaders_ng/radialgradient.frag.qsb
-    shaders_ng/radialgradient.vert.qsb)
+set(qtquickshapes_resource_files
+    "shaders/blit.frag"
+    "shaders/blit.vert"
+    "shaders/blit_core.frag"
+    "shaders/blit_core.vert"
+    "shaders/conicalgradient.frag"
+    "shaders/conicalgradient.vert"
+    "shaders/conicalgradient_core.frag"
+    "shaders/conicalgradient_core.vert"
+    "shaders/lineargradient.frag"
+    "shaders/lineargradient.vert"
+    "shaders/lineargradient_core.frag"
+    "shaders/lineargradient_core.vert"
+    "shaders/radialgradient.frag"
+    "shaders/radialgradient.vert"
+    "shaders/radialgradient_core.frag"
+    "shaders/radialgradient_core.vert"
+    "shaders_ng/conicalgradient.frag.qsb"
+    "shaders_ng/conicalgradient.vert.qsb"
+    "shaders_ng/lineargradient.frag.qsb"
+    "shaders_ng/lineargradient.vert.qsb"
+    "shaders_ng/radialgradient.frag.qsb"
+    "shaders_ng/radialgradient.vert.qsb"
+)
+
+add_qt_resource(QuickShapes "qtquickshapes"
+    PREFIX
+        "/qt-project.org/shapes"
+    FILES
+        ${qtquickshapes_resource_files}
+)
 
 
 #### Keys ignored in scope 1:.:.:quickshapes.pro:<TRUE>:
-# CONFIG = "simd" "optimize_full" "internal_module"
 # _LOADED = "qt_module"
 
 ## Scopes: