1 files changed, 22 insertions, 62 deletions
diff --git a/tools/qml/CMakeLists.txt b/tools/qml/CMakeLists.txt
index 96d030074d..b209c730d3 100644
--- a/tools/qml/CMakeLists.txt
+++ b/tools/qml/CMakeLists.txt
@@ -1,89 +1,49 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 # Generated from qml.pro.
 
 #####################################################################
-## qml Tool:
+## qml App:
 #####################################################################
 
-qt_get_tool_target_name(target_name qml)
-qt_internal_add_tool(${target_name}
+qt_internal_add_app(qml
     TARGET_DESCRIPTION "QML Runtime"
-    TOOLS_TARGET Qml # special case
     SOURCES
         conf.h
         main.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::CorePrivate
         Qt::QmlPrivate
 )
 
-# special case begin
-# Don't set properties on a host tool when cross compiling, because it
-# is not being built.
-if(CMAKE_CROSSCOMPILING AND NOT QT_BUILD_TOOLS_WHEN_CROSSCOMPILING)
-    return()
-endif()
-
-set_source_files_properties(
-    conf/default.qml
-    conf/resizeToItem.qml
-    conf/content/resizeItemToWindow.qml
-    conf/content/resizeWindowToItem.qml
-    PROPERTIES QT_SKIP_QUICKCOMPILER 1
-)
-# 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"
-)
+set_target_properties(qml PROPERTIES WIN32_EXECUTABLE FALSE)
 
-qt_internal_add_resource(${target_name} "qml"
-    PREFIX
-        "/qt-project.org/QmlRuntime"
-    FILES
-        ${qml_resource_files}
+# Turn the tool into its own self-contained qml module
+qt6_add_qml_module(qml
+    RESOURCE_PREFIX "/qt-project.org/imports"
+    URI QmlRuntime.Config
+    VERSION 1.0
+    QML_FILES
+        default.qml
+        resizeToItem.qml
+        ResizeItemToWindow.qml
+        ResizeWindowToItem.qml
+    RESOURCES
+        resources/qml-64.png
 )
 
-
-#### Keys ignored in scope 1:.:.:qml.pro:<TRUE>:
-# ICON = "resources/qml-64.png"
-# QMAKE_TARGET_DESCRIPTION = "QML" "Runtime"
-# QML_IMPORT_NAME = "QmlRuntime.Config"
-# QML_IMPORT_VERSION = "1.0"
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Gui
+qt_internal_extend_target(qml CONDITION TARGET Qt::Gui
     PUBLIC_LIBRARIES
         Qt::Gui
 )
 
-qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(qml CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-#### Keys ignored in scope 4:.:.:qml.pro:WIN32:
-# RC_ICONS = "resources/qml.ico"
-
-#### Keys ignored in scope 5:.:.:qml.pro:APPLE:
-# ICON = "resources/qml.icns"
-# OTHER_FILES = "resources/Info.plist"
-# QMAKE_INFO_PLIST = "resources/Info.plist"
-
-qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug
+qt_internal_extend_target(qml CONDITION QT_FEATURE_qml_debug
     DEFINES
         QT_QML_DEBUG_NO_WARNING
 )
-
-set_target_properties(${target_name} PROPERTIES
-    QT_QML_MODULE_VERSION 1.0
-    QT_QML_MODULE_URI QmlRuntime.Config
-)
-
-qt6_qml_type_registration(${target_name})