Regenerate projects

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

46 files changed, 6 insertions, 74 deletions

diff --git a/src/imports/folderlistmodel/CMakeLists.txt b/src/imports/folderlistmodel/CMakeLists.txt
index d9bb57c950..7cd8d75653 100644
--- a/src/imports/folderlistmodel/CMakeLists.txt
+++ b/src/imports/folderlistmodel/CMakeLists.txt
@@ -26,4 +26,3 @@ add_qml_module(qmlfolderlistmodelplugin
 # CXX_MODULE = "qml"
 # IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
 # TARGETPATH = "Qt/labs/folderlistmodel"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/labsanimation/CMakeLists.txt b/src/imports/labsanimation/CMakeLists.txt
index a296eed5f2..6b54d02d72 100644
--- a/src/imports/labsanimation/CMakeLists.txt
+++ b/src/imports/labsanimation/CMakeLists.txt
@@ -24,4 +24,3 @@ add_qml_module(labsanimationplugin
 # CXX_MODULE = "qml"
 # IMPORT_VERSION = "1.0"
 # TARGETPATH = "Qt/labs/animation"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/labsmodels/CMakeLists.txt b/src/imports/labsmodels/CMakeLists.txt
index 268120ffc1..ce3e290a83 100644
--- a/src/imports/labsmodels/CMakeLists.txt
+++ b/src/imports/labsmodels/CMakeLists.txt
@@ -23,4 +23,3 @@ add_qml_module(labsmodelsplugin
 # CXX_MODULE = "qml"
 # IMPORT_VERSION = "1.0"
 # TARGETPATH = "Qt/labs/qmlmodels"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/layouts/CMakeLists.txt b/src/imports/layouts/CMakeLists.txt
index dbfefb239d..666aae5dc0 100644
--- a/src/imports/layouts/CMakeLists.txt
+++ b/src/imports/layouts/CMakeLists.txt
@@ -33,4 +33,3 @@ add_qml_module(qquicklayoutsplugin
 # CXX_MODULE = "qml"
 # IMPORT_VERSION = "1.$$QT_MINOR_VERSION"
 # TARGETPATH = "QtQuick/Layouts"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/localstorage/CMakeLists.txt b/src/imports/localstorage/CMakeLists.txt
index 665b03e02c..c785a4bd2e 100644
--- a/src/imports/localstorage/CMakeLists.txt
+++ b/src/imports/localstorage/CMakeLists.txt
@@ -26,4 +26,3 @@ add_qml_module(qmllocalstorageplugin
 # IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
 # OTHER_FILES = "localstorage.json"
 # TARGETPATH = "QtQuick/LocalStorage"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/models/CMakeLists.txt b/src/imports/models/CMakeLists.txt
index a7affed6e4..1bfb7a35d3 100644
--- a/src/imports/models/CMakeLists.txt
+++ b/src/imports/models/CMakeLists.txt
@@ -25,4 +25,3 @@ add_qml_module(modelsplugin
 # CXX_MODULE = "qml"
 # IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
 # TARGETPATH = "QtQml/Models.2"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/particles/CMakeLists.txt b/src/imports/particles/CMakeLists.txt
index 04fd522837..f2f0ae8a84 100644
--- a/src/imports/particles/CMakeLists.txt
+++ b/src/imports/particles/CMakeLists.txt
@@ -28,4 +28,3 @@ add_qml_module(particlesplugin
 # CXX_MODULE = "qml"
 # IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
 # TARGETPATH = "QtQuick/Particles.2"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/qtqml/.prev_CMakeLists.txt b/src/imports/qtqml/.prev_CMakeLists.txt
index e8261aa5c7..281e83242f 100644
--- a/src/imports/qtqml/.prev_CMakeLists.txt
+++ b/src/imports/qtqml/.prev_CMakeLists.txt
@@ -27,4 +27,3 @@ add_qml_module(qmlplugin
 # CXX_MODULE = "qml"
 # IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
 # TARGETPATH = "QtQml"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/qtqml/CMakeLists.txt b/src/imports/qtqml/CMakeLists.txt
index 185116e6ce..a8ac5d8b8a 100644
--- a/src/imports/qtqml/CMakeLists.txt
+++ b/src/imports/qtqml/CMakeLists.txt
@@ -28,4 +28,3 @@ add_qml_module(qmlplugin
 # CXX_MODULE = "qml"
 # IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
 # TARGETPATH = "QtQml"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/qtquick2/CMakeLists.txt b/src/imports/qtquick2/CMakeLists.txt
index f40864b8e0..a8dabb3371 100644
--- a/src/imports/qtquick2/CMakeLists.txt
+++ b/src/imports/qtquick2/CMakeLists.txt
@@ -31,7 +31,6 @@ add_qml_module(qtquick2plugin
 # CXX_MODULE = "qml"
 # IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
 # TARGETPATH = "QtQuick.2"
-# _LOADED = "qml_plugin"
 
 ## Scopes:
 #####################################################################
diff --git a/src/imports/settings/CMakeLists.txt b/src/imports/settings/CMakeLists.txt
index 57ab9efa89..d3827443e0 100644
--- a/src/imports/settings/CMakeLists.txt
+++ b/src/imports/settings/CMakeLists.txt
@@ -21,4 +21,3 @@ add_qml_module(qmlsettingsplugin
 # CXX_MODULE = "qml"
 # IMPORT_VERSION = "1.1"
 # TARGETPATH = "Qt/labs/settings"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/shapes/CMakeLists.txt b/src/imports/shapes/CMakeLists.txt
index c91c246ace..525b25e659 100644
--- a/src/imports/shapes/CMakeLists.txt
+++ b/src/imports/shapes/CMakeLists.txt
@@ -27,4 +27,3 @@ add_qml_module(qmlshapesplugin
 # CXX_MODULE = "qml"
 # IMPORT_VERSION = "1.$$QT_MINOR_VERSION"
 # TARGETPATH = "QtQuick/Shapes"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/sharedimage/CMakeLists.txt b/src/imports/sharedimage/CMakeLists.txt
index 6dbf8f8ab7..dcf1b3f8e2 100644
--- a/src/imports/sharedimage/CMakeLists.txt
+++ b/src/imports/sharedimage/CMakeLists.txt
@@ -28,4 +28,3 @@ add_qml_module(sharedimageplugin
 # CXX_MODULE = "qml"
 # IMPORT_VERSION = "1.0"
 # TARGETPATH = "Qt/labs/sharedimage"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/statemachine/CMakeLists.txt b/src/imports/statemachine/CMakeLists.txt
index 187ec496f7..a32278e755 100644
--- a/src/imports/statemachine/CMakeLists.txt
+++ b/src/imports/statemachine/CMakeLists.txt
@@ -30,4 +30,3 @@ add_qml_module(qtqmlstatemachine
 # CXX_MODULE = "qml"
 # IMPORT_VERSION = "1.$$QT_MINOR_VERSION"
 # TARGETPATH = "QtQml/StateMachine"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/testlib/.prev_CMakeLists.txt b/src/imports/testlib/.prev_CMakeLists.txt
index 17cfcc34ec..dad2b51b83 100644
--- a/src/imports/testlib/.prev_CMakeLists.txt
+++ b/src/imports/testlib/.prev_CMakeLists.txt
@@ -31,7 +31,6 @@ add_qml_module(qmltestplugin
 # OTHER_FILES = "testlib.json"
 # QML_FILES = "TestCase.qml" "SignalSpy.qml" "testlogger.js"
 # TARGETPATH = "QtTest"
-# _LOADED = "qml_plugin"
 
 set(qml_files
     "TestCase.qml"
diff --git a/src/imports/testlib/CMakeLists.txt b/src/imports/testlib/CMakeLists.txt
index b72e907fcb..bb33464ba7 100644
--- a/src/imports/testlib/CMakeLists.txt
+++ b/src/imports/testlib/CMakeLists.txt
@@ -31,7 +31,6 @@ add_qml_module(qmltestplugin
 # OTHER_FILES = "testlib.json"
 # QML_FILES = "TestCase.qml" "SignalSpy.qml" "testlogger.js"
 # TARGETPATH = "QtTest"
-# _LOADED = "qml_plugin"
 
 set(qml_files
     "TestCase.qml"
diff --git a/src/imports/wavefrontmesh/CMakeLists.txt b/src/imports/wavefrontmesh/CMakeLists.txt
index 41a88305c7..b43ca7656b 100644
--- a/src/imports/wavefrontmesh/CMakeLists.txt
+++ b/src/imports/wavefrontmesh/CMakeLists.txt
@@ -26,4 +26,3 @@ add_qml_module(qmlwavefrontmeshplugin
 # CXX_MODULE = "qml"
 # IMPORT_VERSION = "1.$$QT_MINOR_VERSION"
 # TARGETPATH = "Qt/labs/wavefrontmesh"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/window/CMakeLists.txt b/src/imports/window/CMakeLists.txt
index 9301f86038..0f76e020e9 100644
--- a/src/imports/window/CMakeLists.txt
+++ b/src/imports/window/CMakeLists.txt
@@ -27,4 +27,3 @@ add_qml_module(windowplugin
 # CXX_MODULE = "qml"
 # IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
 # TARGETPATH = "QtQuick/Window.2"
-# _LOADED = "qml_plugin"
diff --git a/src/imports/workerscript/CMakeLists.txt b/src/imports/workerscript/CMakeLists.txt
index ae0da6de0c..86487e5730 100644
--- a/src/imports/workerscript/CMakeLists.txt
+++ b/src/imports/workerscript/CMakeLists.txt
@@ -25,4 +25,3 @@ add_qml_module(workerscriptplugin
 # CXX_MODULE = "qml"
 # IMPORT_VERSION = "2.$$QT_MINOR_VERSION"
 # TARGETPATH = "QtQml/WorkerScript.2"
-# _LOADED = "qml_plugin"
diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt
index dac7705233..f7aca8859f 100644
--- a/src/particles/CMakeLists.txt
+++ b/src/particles/CMakeLists.txt
@@ -99,7 +99,6 @@ add_qt_resource(QuickParticles "particles1"
 
 #### Keys ignored in scope 1:.:.:particles.pro:<TRUE>:
 # MODULE = "quickparticles"
-# _LOADED = "qt_module"
 
 ## Scopes:
 #####################################################################
diff --git a/src/plugins/qmltooling/packetprotocol/CMakeLists.txt b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt
index 6e19d288a8..7a557b3b3e 100644
--- a/src/plugins/qmltooling/packetprotocol/CMakeLists.txt
+++ b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt
@@ -16,6 +16,3 @@ add_qt_module(PacketProtocol
     PUBLIC_LIBRARIES
         Qt::Core
 )
-
-#### Keys ignored in scope 1:.:.:packetprotocol.pro:<TRUE>:
-# _LOADED = "qt_module"
diff --git a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
index 01c73e4919..f5c3064c2c 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt
@@ -28,4 +28,3 @@ add_qt_plugin(qmldbg_debugger
 
 #### Keys ignored in scope 1:.:.:qmldbg_debugger.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/qqmldebuggerservice.json"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
index cca4d0f793..8e6d45ab40 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt
@@ -30,4 +30,3 @@ add_qt_plugin(qmldbg_inspector
 
 #### Keys ignored in scope 1:.:.:qmldbg_inspector.pro:<TRUE>:
 # OTHER_FILES = "qqmlinspectorservice.json"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
index 377616f059..e12b45c8d3 100644
--- a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt
@@ -18,4 +18,3 @@ add_qt_plugin(qmldbg_local
 
 #### Keys ignored in scope 1:.:.:qmldbg_local.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/qlocalclientconnection.json"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
index 7e2d5df4cf..5b203a8955 100644
--- a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt
@@ -21,4 +21,3 @@ add_qt_plugin(qmldbg_messages
 
 #### Keys ignored in scope 1:.:.:qmldbg_messages.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/qdebugmessageservice.json"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
index 4caa79ba22..95bdce601f 100644
--- a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt
@@ -21,4 +21,3 @@ add_qt_plugin(qmldbg_native
 
 #### Keys ignored in scope 1:.:.:qmldbg_native.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/qqmlnativedebugconnector.json"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
index a106e2f146..d93df65eb0 100644
--- a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt
@@ -21,4 +21,3 @@ add_qt_plugin(qmldbg_nativedebugger
 
 #### Keys ignored in scope 1:.:.:qmldbg_nativedebugger.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/qqmlnativedebugservice.json"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
index f920c602fb..79636c8aea 100644
--- a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt
@@ -32,4 +32,3 @@ add_qt_plugin(qmldbg_preview
 
 #### Keys ignored in scope 1:.:.:qmldbg_preview.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/qqmlpreviewservice.json"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
index 74999f219c..06eb52ecfc 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt
@@ -25,4 +25,3 @@ add_qt_plugin(qmldbg_profiler
 
 #### Keys ignored in scope 1:.:.:qmldbg_profiler.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/qqmlprofilerservice.json"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
index ad88af46bb..5afeaa1775 100644
--- a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt
@@ -25,4 +25,3 @@ add_qt_plugin(qmldbg_quickprofiler
 
 #### Keys ignored in scope 1:.:.:qmldbg_quickprofiler.pro:<TRUE>:
 # OTHER_FILES = "qquickprofileradapter.json"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
index 30045f9fa3..6fb864bc24 100644
--- a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt
@@ -20,4 +20,3 @@ add_qt_plugin(qmldbg_server
 
 #### Keys ignored in scope 1:.:.:qmldbg_server.pro:<TRUE>:
 # OTHER_FILES = "qqmldebugserver.json"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
index 04cfcddc8e..cfc0503ea3 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
+++ b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt
@@ -19,4 +19,3 @@ add_qt_plugin(qmldbg_tcp
 
 #### Keys ignored in scope 1:.:.:qmldbg_tcp.pro:<TRUE>:
 # OTHER_FILES = "$$PWD/qtcpserverconnection.json"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/scenegraph/openvg/CMakeLists.txt b/src/plugins/scenegraph/openvg/CMakeLists.txt
index f1d5e45644..4127556dad 100644
--- a/src/plugins/scenegraph/openvg/CMakeLists.txt
+++ b/src/plugins/scenegraph/openvg/CMakeLists.txt
@@ -43,7 +43,6 @@ add_qt_plugin(qsgopenvgbackend
 # OTHER_FILES = "$$PWD/openvg.json"
 # QMAKE_TARGET_DESCRIPTION = "Quick OpenVG Renderer for Qt."
 # QMAKE_TARGET_PRODUCT = "Qt Quick OpenVG Renderer (Qt $$QT_VERSION)"
-# _LOADED = "qt_plugin"
 
 ## Scopes:
 #####################################################################
diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt
index ee1f3cb31f..8f5ada93c6 100644
--- a/src/qml/.prev_CMakeLists.txt
+++ b/src/qml/.prev_CMakeLists.txt
@@ -335,9 +335,6 @@ qt_process_qlalr(
     ""
 )
 
-#### Keys ignored in scope 1:.:.:qml.pro:<TRUE>:
-# _LOADED = "qt_module"
-
 ## Scopes:
 #####################################################################
 
@@ -382,7 +379,7 @@ extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
         -ftest-coverage
 )
 
-extend_target(Qml CONDITION release AND MSVC AND QT_CL_MAJOR_VERSION___equals___19 AND QT_CL_MINOR_VERSION___equals___00 AND greaterThan(QT_CL_PATCH_VERSION,24212)
+extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19) AND (QT_CL_MINOR_VERSION EQUAL 00) AND (QT_CL_PATCH_VERSION GREATER 24212)
     COMPILE_OPTIONS
         -d2SSAOptimizer-
 )
@@ -390,7 +387,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:(QT_CLANG_MAJOR_VERSION GREATER 3) OR (QT_CLANG_MINOR_VERSION GREATER 3) OR (QT_APPLE_CLANG_MAJOR_VERSION GREATER 5) OR ( (QT_APPLE_CLANG_MAJOR_VERSION EQUAL 5) AND (QT_APPLE_CLANG_MINOR_VERSION GREATER 0) ):
 # WERROR = "-Wno-error=unused-const-variable"
 
 extend_target(Qml CONDITION QT_FEATURE_qml_jit
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index 2be9e58bc9..df2cdf417d 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -335,12 +335,7 @@ add_qt_module(Qml
 #    parser/qqmljs.g
 #    ""
 #)
-# special case end
-
-#### Keys ignored in scope 1:.:.:qml.pro:<TRUE>:
-# _LOADED = "qt_module"
 
-# special case begin
 qt_declarative_write_tag_header(Qml)
 set(_qt_qlalr_flags "--no-debug" "--qt")
 qt_process_qlalr(Qml "${CMAKE_CURRENT_SOURCE_DIR}/parser/qqmljs.g" "${_qt_qlalr_flags}")
@@ -391,7 +386,7 @@ extend_target(Qml CONDITION EXISTS "qqml_enable_gcov"
         -ftest-coverage
 )
 
-extend_target(Qml CONDITION release AND MSVC AND QT_CL_MAJOR_VERSION___equals___19 AND QT_CL_MINOR_VERSION___equals___00 AND greaterThan(QT_CL_PATCH_VERSION,24212)
+extend_target(Qml CONDITION release AND MSVC AND (QT_CL_MAJOR_VERSION EQUAL 19) AND (QT_CL_MINOR_VERSION EQUAL 00) AND (QT_CL_PATCH_VERSION GREATER 24212)
     COMPILE_OPTIONS
         -d2SSAOptimizer-
 )
@@ -399,7 +394,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:(QT_CLANG_MAJOR_VERSION GREATER 3) OR (QT_CLANG_MINOR_VERSION GREATER 3) OR (QT_APPLE_CLANG_MAJOR_VERSION GREATER 5) OR ( (QT_APPLE_CLANG_MAJOR_VERSION EQUAL 5) AND (QT_APPLE_CLANG_MINOR_VERSION GREATER 0) ):
 # WERROR = "-Wno-error=unused-const-variable"
 
 extend_target(Qml CONDITION QT_FEATURE_qml_jit
diff --git a/src/qmldebug/CMakeLists.txt b/src/qmldebug/CMakeLists.txt
index 1972c6b796..d39bf7d69b 100644
--- a/src/qmldebug/CMakeLists.txt
+++ b/src/qmldebug/CMakeLists.txt
@@ -38,6 +38,3 @@ add_qt_module(QmlDebug
         Qt::Network
         Qt::PacketProtocol
 )
-
-#### Keys ignored in scope 1:.:.:qmldebug.pro:<TRUE>:
-# _LOADED = "qt_module"
diff --git a/src/qmldevtools/.prev_CMakeLists.txt b/src/qmldevtools/.prev_CMakeLists.txt
index 7bd3f0de9e..32e05de6b2 100644
--- a/src/qmldevtools/.prev_CMakeLists.txt
+++ b/src/qmldevtools/.prev_CMakeLists.txt
@@ -59,7 +59,6 @@ qt_process_qlalr(
 
 #### Keys ignored in scope 1:.:.:qmldevtools.pro:<TRUE>:
 # MODULE_INCNAME = "QtQml"
-# _LOADED = "qt_module"
 # _OPTION = "host_build"
 
 ## Scopes:
@@ -68,7 +67,7 @@ qt_process_qlalr(
 #### 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 ( (QT_CLANG_MAJOR_VERSION GREATER 3) OR (QT_CLANG_MINOR_VERSION GREATER 3) ):
 # WERROR = "-Wno-error=unused-const-variable"
 
 #### Keys ignored in scope 5:.:../qml/common:../qml/common/common.pri:NOT build_pass:
diff --git a/src/qmldevtools/CMakeLists.txt b/src/qmldevtools/CMakeLists.txt
index cff3b652ac..f819a81b0f 100644
--- a/src/qmldevtools/CMakeLists.txt
+++ b/src/qmldevtools/CMakeLists.txt
@@ -87,7 +87,6 @@ add_dependencies(QmlDevTools Qml)
 
 #### Keys ignored in scope 1:.:.:qmldevtools.pro:<TRUE>:
 # MODULE_INCNAME = "QtQml"
-# _LOADED = "qt_module"
 # _OPTION = "host_build"
 
 ## Scopes:
@@ -96,7 +95,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 ( (QT_CLANG_MAJOR_VERSION GREATER 3) OR (QT_CLANG_MINOR_VERSION GREATER 3) ):
 # WERROR = "-Wno-error=unused-const-variable"
 
 #### Keys ignored in scope 5:.:../qml/common:../qml/common/common.pri:NOT build_pass:
diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt
index 4b6ea4e392..360b2dfa96 100644
--- a/src/qmlmodels/CMakeLists.txt
+++ b/src/qmlmodels/CMakeLists.txt
@@ -21,9 +21,6 @@ add_qt_module(QmlModels
         Qt::Qml
 )
 
-#### Keys ignored in scope 1:.:.:qmlmodels.pro:<TRUE>:
-# _LOADED = "qt_module"
-
 ## Scopes:
 #####################################################################
 
diff --git a/src/qmltest/.prev_CMakeLists.txt b/src/qmltest/.prev_CMakeLists.txt
index 9ff4ade822..e4a5ed71ef 100644
--- a/src/qmltest/.prev_CMakeLists.txt
+++ b/src/qmltest/.prev_CMakeLists.txt
@@ -31,7 +31,6 @@ add_qt_module(QuickTest
 
 #### Keys ignored in scope 1:.:.:qmltest.pro:<TRUE>:
 # MODULE_CONFIG = "$${QT.testlib.CONFIG}"
-# _LOADED = "qt_module"
 
 ## Scopes:
 #####################################################################
diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt
index ead409288f..d576d86036 100644
--- a/src/qmltest/CMakeLists.txt
+++ b/src/qmltest/CMakeLists.txt
@@ -32,7 +32,6 @@ add_qt_module(QuickTest
 
 #### Keys ignored in scope 1:.:.:qmltest.pro:<TRUE>:
 # MODULE_CONFIG = "$${QT.testlib.CONFIG}"
-# _LOADED = "qt_module"
 
 ## Scopes:
 #####################################################################
diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt
index c78d4065f3..21eba19ebc 100644
--- a/src/qmlworkerscript/.prev_CMakeLists.txt
+++ b/src/qmlworkerscript/.prev_CMakeLists.txt
@@ -45,9 +45,6 @@ add_qt_module(QmlWorkerScript
         Qt::Qml
 )
 
-#### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>:
-# _LOADED = "qt_module"
-
 ## Scopes:
 #####################################################################
 
diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt
index 893da25b6b..08877cb2de 100644
--- a/src/qmlworkerscript/CMakeLists.txt
+++ b/src/qmlworkerscript/CMakeLists.txt
@@ -45,9 +45,6 @@ add_qt_module(QmlWorkerScript
         Qt::Qml
 )
 
-#### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>:
-# _LOADED = "qt_module"
-
 ## Scopes:
 #####################################################################
 
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index eea86746a7..7b6e7076a7 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -348,9 +348,6 @@ if(ANDROID)
     )
 endif()
 
-#### Keys ignored in scope 1:.:.:quick.pro:<TRUE>:
-# _LOADED = "qt_module"
-
 ## Scopes:
 #####################################################################
 
diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt
index 661ba534fa..04dda812d0 100644
--- a/src/quickshapes/CMakeLists.txt
+++ b/src/quickshapes/CMakeLists.txt
@@ -56,9 +56,6 @@ add_qt_resource(QuickShapes "qtquickshapes"
 )
 
 
-#### Keys ignored in scope 1:.:.:quickshapes.pro:<TRUE>:
-# _LOADED = "qt_module"
-
 ## Scopes:
 #####################################################################
 
diff --git a/src/quickwidgets/CMakeLists.txt b/src/quickwidgets/CMakeLists.txt
index a1df766eb2..e39477020e 100644
--- a/src/quickwidgets/CMakeLists.txt
+++ b/src/quickwidgets/CMakeLists.txt
@@ -25,6 +25,3 @@ add_qt_module(QuickWidgets
         Qt::Quick
         Qt::Widgets
 )
-
-#### Keys ignored in scope 1:.:.:quickwidgets.pro:<TRUE>:
-# _LOADED = "qt_module"