Regenerate projects

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

24 files changed, 155 insertions, 57 deletions

diff --git a/tools/qml/.prev_CMakeLists.txt b/tools/qml/.prev_CMakeLists.txt
index 67dee9c4ba..fc1f44d336 100644
--- a/tools/qml/.prev_CMakeLists.txt
+++ b/tools/qml/.prev_CMakeLists.txt
@@ -16,22 +16,25 @@ add_qt_tool(qml
 )
 
 # Resources:
+set(qml_resource_files
+    "conf/content/resizeItemToWindow.qml"
+    "conf/content/resizeWindowToItem.qml"
+    "conf/default.qml"
+    "conf/resizeToItem.qml"
+    "resources/qml-64.png"
+)
+
 add_qt_resource(qml "qml"
     PREFIX
         "/qt-project.org/QmlRuntime"
     FILES
-        conf/content/resizeItemToWindow.qml
-        conf/content/resizeWindowToItem.qml
-        conf/default.qml
-        conf/resizeToItem.qml
-        resources/qml-64.png
+        ${qml_resource_files}
 )
 
 
 #### Keys ignored in scope 1:.:.:qml.pro:<TRUE>:
 # ICON = "resources/qml64.png"
 # QMAKE_TARGET_DESCRIPTION = "QML" "Runtime"
-# _LOADED = "qt_tool"
 
 ## Scopes:
 #####################################################################
diff --git a/tools/qml/CMakeLists.txt b/tools/qml/CMakeLists.txt
index bd8d32f880..84d4c9b803 100644
--- a/tools/qml/CMakeLists.txt
+++ b/tools/qml/CMakeLists.txt
@@ -27,22 +27,25 @@ set_source_files_properties(
 # special case end
 
 # Resources:
+set(qml_resource_files
+    "conf/content/resizeItemToWindow.qml"
+    "conf/content/resizeWindowToItem.qml"
+    "conf/default.qml"
+    "conf/resizeToItem.qml"
+    "resources/qml-64.png"
+)
+
 add_qt_resource(qml "qml"
     PREFIX
         "/qt-project.org/QmlRuntime"
     FILES
-        conf/content/resizeItemToWindow.qml
-        conf/content/resizeWindowToItem.qml
-        conf/default.qml
-        conf/resizeToItem.qml
-        resources/qml-64.png
+        ${qml_resource_files}
 )
 
 
 #### Keys ignored in scope 1:.:.:qml.pro:<TRUE>:
 # ICON = "resources/qml64.png"
 # QMAKE_TARGET_DESCRIPTION = "QML" "Runtime"
-# _LOADED = "qt_tool"
 
 ## Scopes:
 #####################################################################
diff --git a/tools/qmlcachegen/.prev_CMakeLists.txt b/tools/qmlcachegen/.prev_CMakeLists.txt
index d4ad2adb6d..d509bad865 100644
--- a/tools/qmlcachegen/.prev_CMakeLists.txt
+++ b/tools/qmlcachegen/.prev_CMakeLists.txt
@@ -20,10 +20,9 @@ add_qt_tool(qmlcachegen
 )
 
 #### Keys ignored in scope 1:.:.:qmlcachegen.pro:<TRUE>:
-# CMAKE_BIN_DIR = "$$cmakeRelativePath$$[QT_HOST_BINS],$$[QT_INSTALL_PREFIX]"
+# CMAKE_BIN_DIR = "$$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])"
 # QMAKE_SUBSTITUTES = "cmake_config_file"
 # QMAKE_TARGET_DESCRIPTION = "QML" "Cache" "Generator"
-# _LOADED = "cmake_functions" "qt_build_paths" "qt_tool"
 # _OPTION = "host_build"
 # build_integration.files = "qmlcache.prf" "qtquickcompiler.prf"
 # build_integration.path = "$$[QT_HOST_DATA]/mkspecs/features"
@@ -36,10 +35,10 @@ add_qt_tool(qmlcachegen
 #####################################################################
 
 #### Keys ignored in scope 2:.:.:qmlcachegen.pro:prefix_build:
-# INSTALLS = "build_integration" "cmake_build_integration"
+# INSTALLS = "cmake_build_integration" "build_integration"
 
 #### Keys ignored in scope 3:.:.:qmlcachegen.pro:else:
-# COPIES = "build_integration" "cmake_build_integration"
+# COPIES = "cmake_build_integration" "build_integration"
 
 #### Keys ignored in scope 4:.:.:qmlcachegen.pro:CMAKE_BIN_DIR___contains___^\\.\\./._x_:
 # CMAKE_BIN_DIR = "$$[QT_HOST_BINS]/"
diff --git a/tools/qmlcachegen/CMakeLists.txt b/tools/qmlcachegen/CMakeLists.txt
index 253421bbc4..4d82c9ce3e 100644
--- a/tools/qmlcachegen/CMakeLists.txt
+++ b/tools/qmlcachegen/CMakeLists.txt
@@ -21,10 +21,9 @@ add_qt_tool(qmlcachegen
 )
 
 #### Keys ignored in scope 1:.:.:qmlcachegen.pro:<TRUE>:
-# CMAKE_BIN_DIR = "$$cmakeRelativePath$$[QT_HOST_BINS],$$[QT_INSTALL_PREFIX]"
+# CMAKE_BIN_DIR = "$$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])"
 # QMAKE_SUBSTITUTES = "cmake_config_file"
 # QMAKE_TARGET_DESCRIPTION = "QML" "Cache" "Generator"
-# _LOADED = "cmake_functions" "qt_build_paths" "qt_tool"
 # _OPTION = "host_build"
 # build_integration.files = "qmlcache.prf" "qtquickcompiler.prf"
 # build_integration.path = "$$[QT_HOST_DATA]/mkspecs/features"
@@ -37,10 +36,10 @@ add_qt_tool(qmlcachegen
 #####################################################################
 
 #### Keys ignored in scope 2:.:.:qmlcachegen.pro:prefix_build:
-# INSTALLS = "build_integration" "cmake_build_integration"
+# INSTALLS = "cmake_build_integration" "build_integration"
 
 #### Keys ignored in scope 3:.:.:qmlcachegen.pro:else:
-# COPIES = "build_integration" "cmake_build_integration"
+# COPIES = "cmake_build_integration" "build_integration"
 
 #### Keys ignored in scope 4:.:.:qmlcachegen.pro:CMAKE_BIN_DIR___contains___^\\.\\./._x_:
 # CMAKE_BIN_DIR = "$$[QT_HOST_BINS]/"
diff --git a/tools/qmleasing/CMakeLists.txt b/tools/qmleasing/CMakeLists.txt
index 036a554b51..9893d8e657 100644
--- a/tools/qmleasing/CMakeLists.txt
+++ b/tools/qmleasing/CMakeLists.txt
@@ -15,6 +15,7 @@ add_qt_executable(qmleasing
         segmentproperties.cpp segmentproperties.h
         splineeditor.cpp splineeditor.h
     PUBLIC_LIBRARIES
+        Qt::Gui
         Qt::Qml
         Qt::Quick
         Qt::Widgets
@@ -23,11 +24,18 @@ add_qt_executable(qmleasing
 )
 
 # Resources:
-add_qt_resource(qmleasing "resources" PREFIX "/" FILES
-    Button.qml
-    preview.qml)
+set(resources_resource_files
+    "Button.qml"
+    "preview.qml"
+)
+
+add_qt_resource(qmleasing "resources"
+    PREFIX
+        "/"
+    FILES
+        ${resources_resource_files}
+)
 
 
 #### Keys ignored in scope 1:.:.:qmleasing.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "QML" "Easing" "Curve" "Editor"
-# _LOADED = "qt_app"
diff --git a/tools/qmlimportscanner/.prev_CMakeLists.txt b/tools/qmlimportscanner/.prev_CMakeLists.txt
index 9400878c15..cdaf3b8bbe 100644
--- a/tools/qmlimportscanner/.prev_CMakeLists.txt
+++ b/tools/qmlimportscanner/.prev_CMakeLists.txt
@@ -17,6 +17,59 @@ add_qt_tool(qmlimportscanner
 )
 
 #### Keys ignored in scope 1:.:.:qmlimportscanner.pro:<TRUE>:
+# CMAKE_BIN_DIR = "$$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])"
+# CMAKE_DEBUG_TYPE = <EMPTY>
+# CMAKE_QML_DIR = "$$cmakeRelativePath($$[QT_INSTALL_QML/get], $$[QT_INSTALL_PREFIX])"
+# CMAKE_QML_PLUGIN_SUFFIX_RELEASE = <EMPTY>
+# CMAKE_RELEASE_TYPE = <EMPTY>
+# QMAKE_SUBSTITUTES = "cmake_config_file"
 # QMAKE_TARGET_DESCRIPTION = "QML" "Import" "Scanner"
-# _LOADED = "qt_tool"
 # _OPTION = "host_build"
+# cmake_build_integration.files = "$$cmake_config_file.output" "$$PWD/Qt5QmlImportScannerTemplate.cpp.in"
+# cmake_build_integration.path = "$$[QT_INSTALL_LIBS]/cmake/Qt5QmlImportScanner"
+# cmake_config_file.input = "$$PWD/Qt5QmlImportScannerConfig.cmake.in"
+# cmake_config_file.output = "$$MODULE_BASE_OUTDIR/lib/cmake/Qt5QmlImportScanner/Qt5QmlImportScannerConfig.cmake"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:qmlimportscanner.pro:CMAKE_BIN_DIR___contains___^\\.\\./._x_:
+# CMAKE_BIN_DIR = "$$[QT_HOST_BINS]/"
+# CMAKE_BIN_DIR_IS_ABSOLUTE = "True"
+
+#### Keys ignored in scope 3:.:.:qmlimportscanner.pro:CMAKE_QML_DIR___contains___^\\.\\./._x_:
+# CMAKE_QML_DIR = "$$[QT_INSTALL_QML/get]/"
+# CMAKE_QML_DIR_IS_ABSOLUTE = "True"
+
+#### Keys ignored in scope 4:.:.:qmlimportscanner.pro:static OR staticlib:
+# CMAKE_STATIC_TYPE = "true"
+
+#### Keys ignored in scope 5:.:.:qmlimportscanner.pro:WIN32:
+# CMAKE_QML_PLUGIN_SUFFIX_DEBUG = "d"
+
+#### Keys ignored in scope 7:.:.:qmlimportscanner.pro:APPLE:
+# CMAKE_QML_PLUGIN_SUFFIX_DEBUG = "_debug"
+
+#### Keys ignored in scope 8:.:.:qmlimportscanner.pro:else:
+# CMAKE_QML_PLUGIN_SUFFIX_DEBUG = <EMPTY>
+
+#### Keys ignored in scope 9:.:.:qmlimportscanner.pro:( QT_FEATURE_debug_and_release OR QT_CONFIG___contains___debug,debug OR release ):
+# CMAKE_DEBUG_TYPE = "debug"
+
+#### Keys ignored in scope 10:.:.:qmlimportscanner.pro:( QT_FEATURE_debug_and_release OR QT_CONFIG___contains___release,debug OR release ):
+# CMAKE_RELEASE_TYPE = "release"
+
+#### Keys ignored in scope 11:.:.:qmlimportscanner.pro:QT_FEATURE_debug_and_release:
+# CMAKE_DEBUG_AND_RELEASE = "TRUE"
+
+#### Keys ignored in scope 12:.:.:qmlimportscanner.pro:else:
+# CMAKE_DEBUG_AND_RELEASE = "FALSE"
+
+#### Keys ignored in scope 13:.:.:qmlimportscanner.pro:QMAKE_HOST.os___equals___Windows:
+# CMAKE_BIN_SUFFIX = ".exe"
+
+#### Keys ignored in scope 14:.:.:qmlimportscanner.pro:prefix_build:
+# INSTALLS = "cmake_build_integration"
+
+#### Keys ignored in scope 15:.:.:qmlimportscanner.pro:else:
+# COPIES = "cmake_build_integration"
diff --git a/tools/qmlimportscanner/CMakeLists.txt b/tools/qmlimportscanner/CMakeLists.txt
index 8bd1191b82..05f8837880 100644
--- a/tools/qmlimportscanner/CMakeLists.txt
+++ b/tools/qmlimportscanner/CMakeLists.txt
@@ -18,6 +18,59 @@ add_qt_tool(qmlimportscanner
 )
 
 #### Keys ignored in scope 1:.:.:qmlimportscanner.pro:<TRUE>:
+# CMAKE_BIN_DIR = "$$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])"
+# CMAKE_DEBUG_TYPE = <EMPTY>
+# CMAKE_QML_DIR = "$$cmakeRelativePath($$[QT_INSTALL_QML/get], $$[QT_INSTALL_PREFIX])"
+# CMAKE_QML_PLUGIN_SUFFIX_RELEASE = <EMPTY>
+# CMAKE_RELEASE_TYPE = <EMPTY>
+# QMAKE_SUBSTITUTES = "cmake_config_file"
 # QMAKE_TARGET_DESCRIPTION = "QML" "Import" "Scanner"
-# _LOADED = "qt_tool"
 # _OPTION = "host_build"
+# cmake_build_integration.files = "$$cmake_config_file.output" "$$PWD/Qt5QmlImportScannerTemplate.cpp.in"
+# cmake_build_integration.path = "$$[QT_INSTALL_LIBS]/cmake/Qt5QmlImportScanner"
+# cmake_config_file.input = "$$PWD/Qt5QmlImportScannerConfig.cmake.in"
+# cmake_config_file.output = "$$MODULE_BASE_OUTDIR/lib/cmake/Qt5QmlImportScanner/Qt5QmlImportScannerConfig.cmake"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:qmlimportscanner.pro:CMAKE_BIN_DIR___contains___^\\.\\./._x_:
+# CMAKE_BIN_DIR = "$$[QT_HOST_BINS]/"
+# CMAKE_BIN_DIR_IS_ABSOLUTE = "True"
+
+#### Keys ignored in scope 3:.:.:qmlimportscanner.pro:CMAKE_QML_DIR___contains___^\\.\\./._x_:
+# CMAKE_QML_DIR = "$$[QT_INSTALL_QML/get]/"
+# CMAKE_QML_DIR_IS_ABSOLUTE = "True"
+
+#### Keys ignored in scope 4:.:.:qmlimportscanner.pro:static OR staticlib:
+# CMAKE_STATIC_TYPE = "true"
+
+#### Keys ignored in scope 5:.:.:qmlimportscanner.pro:WIN32:
+# CMAKE_QML_PLUGIN_SUFFIX_DEBUG = "d"
+
+#### Keys ignored in scope 7:.:.:qmlimportscanner.pro:APPLE:
+# CMAKE_QML_PLUGIN_SUFFIX_DEBUG = "_debug"
+
+#### Keys ignored in scope 8:.:.:qmlimportscanner.pro:else:
+# CMAKE_QML_PLUGIN_SUFFIX_DEBUG = <EMPTY>
+
+#### Keys ignored in scope 9:.:.:qmlimportscanner.pro:( QT_FEATURE_debug_and_release OR QT_CONFIG___contains___debug,debug OR release ):
+# CMAKE_DEBUG_TYPE = "debug"
+
+#### Keys ignored in scope 10:.:.:qmlimportscanner.pro:( QT_FEATURE_debug_and_release OR QT_CONFIG___contains___release,debug OR release ):
+# CMAKE_RELEASE_TYPE = "release"
+
+#### Keys ignored in scope 11:.:.:qmlimportscanner.pro:QT_FEATURE_debug_and_release:
+# CMAKE_DEBUG_AND_RELEASE = "TRUE"
+
+#### Keys ignored in scope 12:.:.:qmlimportscanner.pro:else:
+# CMAKE_DEBUG_AND_RELEASE = "FALSE"
+
+#### Keys ignored in scope 13:.:.:qmlimportscanner.pro:QMAKE_HOST.os___equals___Windows:
+# CMAKE_BIN_SUFFIX = ".exe"
+
+#### Keys ignored in scope 14:.:.:qmlimportscanner.pro:prefix_build:
+# INSTALLS = "cmake_build_integration"
+
+#### Keys ignored in scope 15:.:.:qmlimportscanner.pro:else:
+# COPIES = "cmake_build_integration"
diff --git a/tools/qmljs/.prev_CMakeLists.txt b/tools/qmljs/.prev_CMakeLists.txt
index 037ffdb8c5..2c3b500e03 100644
--- a/tools/qmljs/.prev_CMakeLists.txt
+++ b/tools/qmljs/.prev_CMakeLists.txt
@@ -41,7 +41,6 @@ add_qt_tool(qmljs
 #### Keys ignored in scope 1:.:.:qmljs.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "QML" "JavaScript" "Tool"
 # TEMPLATE = "app"
-# _LOADED = "qt_tool"
 
 ## Scopes:
 #####################################################################
@@ -51,7 +50,7 @@ extend_target(qmljs CONDITION WIN32
         NOMINMAX
 )
 
-extend_target(qmljs CONDITION (disassembler) AND ((TEST_architecture_arch STREQUAL "i386")" OR isEqual(QT_ARCH,"x86_64))
+extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
     DEFINES
         WTF_USE_UDIS86=1
 )
@@ -76,12 +75,12 @@ extend_target(qmljs CONDITION NOT disassembler
         WTF_USE_UDIS86=0
 )
 
-extend_target(qmljs CONDITION (CMAKE_BUILD_TYPE STREQUAL Release)
+extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release
     DEFINES
         NDEBUG
 )
 
-extend_target(qmljs CONDITION (NOT ICC AND NOT CLANG AND GCC) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 6))
+extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
     COMPILE_OPTIONS
         -Wno-expansion-to-defined
 )
diff --git a/tools/qmljs/CMakeLists.txt b/tools/qmljs/CMakeLists.txt
index 14a9304bd1..300a9ac47a 100644
--- a/tools/qmljs/CMakeLists.txt
+++ b/tools/qmljs/CMakeLists.txt
@@ -42,7 +42,6 @@ add_qt_tool(qmljs
 #### Keys ignored in scope 1:.:.:qmljs.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "QML" "JavaScript" "Tool"
 # TEMPLATE = "app"
-# _LOADED = "qt_tool"
 
 ## Scopes:
 #####################################################################
@@ -52,7 +51,7 @@ extend_target(qmljs CONDITION WIN32
         NOMINMAX
 )
 
-extend_target(qmljs CONDITION (disassembler) AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) # special case
+extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64"))
     DEFINES
         WTF_USE_UDIS86=1
 )
@@ -77,12 +76,12 @@ extend_target(qmljs CONDITION NOT disassembler
         WTF_USE_UDIS86=0
 )
 
-extend_target(qmljs CONDITION (CMAKE_BUILD_TYPE STREQUAL Release)
+extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release
     DEFINES
         NDEBUG
 )
 
-extend_target(qmljs CONDITION (NOT ICC AND NOT CLANG AND GCC) AND ((QT_COMPILER_VERSION_MAJOR STRGREATER 6))
+extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC
     COMPILE_OPTIONS
         -Wno-expansion-to-defined
 )
diff --git a/tools/qmllint/.prev_CMakeLists.txt b/tools/qmllint/.prev_CMakeLists.txt
index 9970e494b6..cdc76dd106 100644
--- a/tools/qmllint/.prev_CMakeLists.txt
+++ b/tools/qmllint/.prev_CMakeLists.txt
@@ -21,5 +21,4 @@ add_qt_tool(qmllint
 
 #### Keys ignored in scope 1:.:.:qmllint.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "QML" "Syntax" "Verifier"
-# _LOADED = "qt_tool"
 # _OPTION = "host_build"
diff --git a/tools/qmllint/CMakeLists.txt b/tools/qmllint/CMakeLists.txt
index 5b3128458f..949e6e51fa 100644
--- a/tools/qmllint/CMakeLists.txt
+++ b/tools/qmllint/CMakeLists.txt
@@ -22,5 +22,4 @@ add_qt_tool(qmllint
 
 #### Keys ignored in scope 1:.:.:qmllint.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "QML" "Syntax" "Verifier"
-# _LOADED = "qt_tool"
 # _OPTION = "host_build"
diff --git a/tools/qmlmin/.prev_CMakeLists.txt b/tools/qmlmin/.prev_CMakeLists.txt
index 9097a219aa..39df27a3bd 100644
--- a/tools/qmlmin/.prev_CMakeLists.txt
+++ b/tools/qmlmin/.prev_CMakeLists.txt
@@ -15,5 +15,4 @@ add_qt_tool(qmlmin
 
 #### Keys ignored in scope 1:.:.:qmlmin.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "QML/JS" "Minifier"
-# _LOADED = "qt_tool"
 # _OPTION = "host_build"
diff --git a/tools/qmlmin/CMakeLists.txt b/tools/qmlmin/CMakeLists.txt
index 046cd6d8fe..73d764aace 100644
--- a/tools/qmlmin/CMakeLists.txt
+++ b/tools/qmlmin/CMakeLists.txt
@@ -16,5 +16,4 @@ add_qt_tool(qmlmin
 
 #### Keys ignored in scope 1:.:.:qmlmin.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "QML/JS" "Minifier"
-# _LOADED = "qt_tool"
 # _OPTION = "host_build"
diff --git a/tools/qmlplugindump/.prev_CMakeLists.txt b/tools/qmlplugindump/.prev_CMakeLists.txt
index c9c78e6a55..561a1cc6d9 100644
--- a/tools/qmlplugindump/.prev_CMakeLists.txt
+++ b/tools/qmlplugindump/.prev_CMakeLists.txt
@@ -14,6 +14,7 @@ add_qt_tool(qmlplugindump
         Qt::QmlPrivate
         Qt::QuickPrivate
     PUBLIC_LIBRARIES
+        Qt::Gui
         Qt::Qml
         Qt::Quick
 )
@@ -21,7 +22,6 @@ add_qt_tool(qmlplugindump
 #### Keys ignored in scope 1:.:.:qmlplugindump.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "QML" "Plugin" "Metadata" "Dumper"
 # QTPLUGIN.platforms = "qminimal"
-# _LOADED = "qt_tool"
 
 ## Scopes:
 #####################################################################
@@ -35,6 +35,3 @@ extend_target(qmlplugindump CONDITION APPLE_OSX
     LINK_OPTIONS
         "-Wl,-sectcreate,__TEXT,__info_plist,$$shell_quote$$PWD/Info.plist"
 )
-
-#### Keys ignored in scope 3:.:.:qmlplugindump.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tools/qmlplugindump/CMakeLists.txt b/tools/qmlplugindump/CMakeLists.txt
index 67abd0e516..57f96a1f94 100644
--- a/tools/qmlplugindump/CMakeLists.txt
+++ b/tools/qmlplugindump/CMakeLists.txt
@@ -15,6 +15,7 @@ add_qt_tool(qmlplugindump
         Qt::QmlPrivate
         Qt::QuickPrivate
     PUBLIC_LIBRARIES
+        Qt::Gui
         Qt::Qml
         Qt::Quick
 )
@@ -22,7 +23,6 @@ add_qt_tool(qmlplugindump
 #### Keys ignored in scope 1:.:.:qmlplugindump.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "QML" "Plugin" "Metadata" "Dumper"
 # QTPLUGIN.platforms = "qminimal"
-# _LOADED = "qt_tool"
 
 ## Scopes:
 #####################################################################
@@ -36,6 +36,3 @@ extend_target(qmlplugindump CONDITION APPLE_OSX
     LINK_OPTIONS
         "-Wl,-sectcreate,__TEXT,__info_plist,${CMAKE_CURRENT_SOURCE_DIR}/Info.plist" # special case
 )
-
-#### Keys ignored in scope 3:.:.:qmlplugindump.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"
diff --git a/tools/qmlpreview/.prev_CMakeLists.txt b/tools/qmlpreview/.prev_CMakeLists.txt
index 4fbad0984b..c1c40d5fbf 100644
--- a/tools/qmlpreview/.prev_CMakeLists.txt
+++ b/tools/qmlpreview/.prev_CMakeLists.txt
@@ -18,4 +18,3 @@ add_qt_tool(qmlpreview
 
 #### Keys ignored in scope 1:.:.:qmlpreview.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "QML" "Preview"
-# _LOADED = "qt_tool"
diff --git a/tools/qmlpreview/CMakeLists.txt b/tools/qmlpreview/CMakeLists.txt
index 84397a23ff..7e0b808f2c 100644
--- a/tools/qmlpreview/CMakeLists.txt
+++ b/tools/qmlpreview/CMakeLists.txt
@@ -19,4 +19,3 @@ add_qt_tool(qmlpreview
 
 #### Keys ignored in scope 1:.:.:qmlpreview.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "QML" "Preview"
-# _LOADED = "qt_tool"
diff --git a/tools/qmlprofiler/.prev_CMakeLists.txt b/tools/qmlprofiler/.prev_CMakeLists.txt
index 0bed3213bd..1d6ac20ad6 100644
--- a/tools/qmlprofiler/.prev_CMakeLists.txt
+++ b/tools/qmlprofiler/.prev_CMakeLists.txt
@@ -21,4 +21,3 @@ add_qt_tool(qmlprofiler
 
 #### Keys ignored in scope 1:.:.:qmlprofiler.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "QML" "Profiler"
-# _LOADED = "qt_tool"
diff --git a/tools/qmlprofiler/CMakeLists.txt b/tools/qmlprofiler/CMakeLists.txt
index d0b46b5bef..672a782136 100644
--- a/tools/qmlprofiler/CMakeLists.txt
+++ b/tools/qmlprofiler/CMakeLists.txt
@@ -22,4 +22,3 @@ add_qt_tool(qmlprofiler
 
 #### Keys ignored in scope 1:.:.:qmlprofiler.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "QML" "Profiler"
-# _LOADED = "qt_tool"
diff --git a/tools/qmlscene/.prev_CMakeLists.txt b/tools/qmlscene/.prev_CMakeLists.txt
index ba1c200bd0..da19ae27bb 100644
--- a/tools/qmlscene/.prev_CMakeLists.txt
+++ b/tools/qmlscene/.prev_CMakeLists.txt
@@ -21,7 +21,6 @@ add_qt_tool(qmlscene
 
 #### Keys ignored in scope 1:.:.:qmlscene.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "QML" "Scene" "Viewer"
-# _LOADED = "qt_tool"
 
 ## Scopes:
 #####################################################################
diff --git a/tools/qmlscene/CMakeLists.txt b/tools/qmlscene/CMakeLists.txt
index e9796871f5..1414009587 100644
--- a/tools/qmlscene/CMakeLists.txt
+++ b/tools/qmlscene/CMakeLists.txt
@@ -22,7 +22,6 @@ add_qt_tool(qmlscene
 
 #### Keys ignored in scope 1:.:.:qmlscene.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "QML" "Scene" "Viewer"
-# _LOADED = "qt_tool"
 
 ## Scopes:
 #####################################################################
diff --git a/tools/qmltestrunner/.prev_CMakeLists.txt b/tools/qmltestrunner/.prev_CMakeLists.txt
index cace9385b7..c02d6e0226 100644
--- a/tools/qmltestrunner/.prev_CMakeLists.txt
+++ b/tools/qmltestrunner/.prev_CMakeLists.txt
@@ -8,10 +8,10 @@ add_qt_tool(qmltestrunner
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
+        Qt::Gui
         Qt::Qml
         Qt::QuickTest
 )
 
 #### Keys ignored in scope 1:.:.:qmltestrunner.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "QML" "Test" "Runner"
-# _LOADED = "qt_tool"
diff --git a/tools/qmltestrunner/CMakeLists.txt b/tools/qmltestrunner/CMakeLists.txt
index 5e942fe8ec..0823d57c00 100644
--- a/tools/qmltestrunner/CMakeLists.txt
+++ b/tools/qmltestrunner/CMakeLists.txt
@@ -9,10 +9,10 @@ add_qt_tool(qmltestrunner
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
+        Qt::Gui
         Qt::Qml
         Qt::QuickTest
 )
 
 #### Keys ignored in scope 1:.:.:qmltestrunner.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "QML" "Test" "Runner"
-# _LOADED = "qt_tool"
diff --git a/tools/qmltime/CMakeLists.txt b/tools/qmltime/CMakeLists.txt
index b70d63a605..77b3e59368 100644
--- a/tools/qmltime/CMakeLists.txt
+++ b/tools/qmltime/CMakeLists.txt
@@ -11,6 +11,7 @@ add_qt_executable(qmltime
     LIBRARIES
         Qt::QuickPrivate
     PUBLIC_LIBRARIES
+        Qt::Gui
         Qt::Qml
         Qt::Quick
 )
@@ -21,6 +22,3 @@ add_qt_executable(qmltime
 
 ## Scopes:
 #####################################################################
-
-#### Keys ignored in scope 2:.:.:qmltime.pro:APPLE_OSX:
-# CONFIG = "-app_bundle"