Turn qml, qmlscene and qmlpreview into apps

Before, they were tools, which means they are not built when
cross-compiling.  However, all these tools are likely to be desired on a
target to run QML-only projects.

The earlier way to build these apps for a cross target was to set
QT_BUILD_TOOLS_WHEN_CROSSCOMPILING to ON.  That seems like overkill.

Pick-to: 6.2
Task-number: QTBUG-96454
Change-Id: Ibbdc4e4599b0c798ddbd96804a0bbb821f546415
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: Alexandru Croitor <[email protected]>

4 files changed, 20 insertions, 26 deletions

diff --git a/tools/qml/CMakeLists.txt b/tools/qml/CMakeLists.txt
index e719b0b49b..6cc772de9c 100644
--- a/tools/qml/CMakeLists.txt
+++ b/tools/qml/CMakeLists.txt
@@ -1,13 +1,11 @@
 # 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
@@ -16,12 +14,7 @@ qt_internal_add_tool(${target_name}
         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_target_properties(qml PROPERTIES WIN32_EXECUTABLE FALSE)
 
 set_source_files_properties(
     conf/default.qml
@@ -30,7 +23,6 @@ set_source_files_properties(
     conf/content/resizeWindowToItem.qml
     PROPERTIES QT_SKIP_QUICKCOMPILER 1
 )
-# special case end
 
 # Resources:
 set(qml_resource_files
@@ -41,7 +33,7 @@ set(qml_resource_files
     "resources/qml-64.png"
 )
 
-qt_internal_add_resource(${target_name} "qml"
+qt_internal_add_resource(qml qml
     PREFIX
         "/qt-project.org/QmlRuntime"
     FILES
@@ -49,17 +41,17 @@ qt_internal_add_resource(${target_name} "qml"
 )
 
 # Turn the tool into its own self-contained qml module
-qt6_add_qml_module(${target_name}
+qt6_add_qml_module(qml
     URI QmlRuntime.Config
     VERSION 1.0
 )
 
-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
 )
@@ -72,7 +64,7 @@ qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Widgets
 # 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
 )
diff --git a/tools/qmleasing/CMakeLists.txt b/tools/qmleasing/CMakeLists.txt
index 7257b7cf6e..7ad22a3033 100644
--- a/tools/qmleasing/CMakeLists.txt
+++ b/tools/qmleasing/CMakeLists.txt
@@ -22,6 +22,8 @@ qt_internal_add_app(qmleasing
         uic
 )
 
+set_target_properties(qmleasing PROPERTIES WIN32_EXECUTABLE FALSE)
+
 # Resources:
 set(resources_resource_files
     "Button.qml"
diff --git a/tools/qmlpreview/CMakeLists.txt b/tools/qmlpreview/CMakeLists.txt
index 4c347a404e..792e1ec3f4 100644
--- a/tools/qmlpreview/CMakeLists.txt
+++ b/tools/qmlpreview/CMakeLists.txt
@@ -1,13 +1,11 @@
 # Generated from qmlpreview.pro.
 
 #####################################################################
-## qmlpreview Tool:
+## qmlpreview App:
 #####################################################################
 
-qt_get_tool_target_name(target_name qmlpreview)
-qt_internal_add_tool(${target_name}
+qt_internal_add_app(qmlpreview
     TARGET_DESCRIPTION "QML Preview"
-    TOOLS_TARGET Qml # special case
     SOURCES
         main.cpp
         qmlpreviewapplication.cpp qmlpreviewapplication.h
@@ -17,5 +15,7 @@ qt_internal_add_tool(${target_name}
         Qt::QmlDebugPrivate
 )
 
+set_target_properties(qmlpreview PROPERTIES WIN32_EXECUTABLE FALSE)
+
 #### Keys ignored in scope 1:.:.:qmlpreview.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "QML" "Preview"
diff --git a/tools/qmlscene/CMakeLists.txt b/tools/qmlscene/CMakeLists.txt
index 4566a60441..a55022371f 100644
--- a/tools/qmlscene/CMakeLists.txt
+++ b/tools/qmlscene/CMakeLists.txt
@@ -1,13 +1,11 @@
 # Generated from qmlscene.pro.
 
 #####################################################################
-## qmlscene Tool:
+## qmlscene App:
 #####################################################################
 
-qt_get_tool_target_name(target_name qmlscene)
-qt_internal_add_tool(${target_name}
+qt_internal_add_app(qmlscene
     TARGET_DESCRIPTION "QML Scene Viewer"
-    TOOLS_TARGET Qml # special case
     SOURCES
         main.cpp
     DEFINES
@@ -21,18 +19,20 @@ qt_internal_add_tool(${target_name}
         Qt::QuickPrivate
 )
 
+set_target_properties(qmlscene PROPERTIES WIN32_EXECUTABLE FALSE)
+
 #### Keys ignored in scope 1:.:.:qmlscene.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "QML" "Scene" "Viewer"
 
 ## Scopes:
 #####################################################################
 
-qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Widgets
+qt_internal_extend_target(qmlscene CONDITION TARGET Qt::Widgets
     PUBLIC_LIBRARIES
         Qt::Widgets
 )
 
-qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug
+qt_internal_extend_target(qmlscene CONDITION QT_FEATURE_qml_debug
     DEFINES
         QT_QML_DEBUG_NO_WARNING
 )