CMake: Regenerate load(qt_app) projects

These now use the new qt_internal_add_app function. Also the script
will output necessary code to set the icons and resource files for
each of the apps.

Task-number: QTBUG-85757
Change-Id: I1a336243fc53a7f329ca17e6c1e40818dabeae30
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

19 files changed, 457 insertions, 81 deletions

diff --git a/src/assistant/assistant/.prev_CMakeLists.txt b/src/assistant/assistant/.prev_CMakeLists.txt
index 3fccf245b..42241ec7f 100644
--- a/src/assistant/assistant/.prev_CMakeLists.txt
+++ b/src/assistant/assistant/.prev_CMakeLists.txt
@@ -1,11 +1,10 @@
 # Generated from assistant.pro.
 
 #####################################################################
-## assistant Binary:
+## assistant App:
 #####################################################################
 
-qt_add_executable(assistant
-    GUI
+qt_internal_add_app(assistant
     SOURCES
         ../../shared/fontpanel/fontpanel.cpp ../../shared/fontpanel/fontpanel.h
         ../shared/collectionconfiguration.cpp ../shared/collectionconfiguration.h
@@ -106,10 +105,12 @@ qt_add_resource(assistant "assistant_images"
         ${assistant_images_resource_files}
 )
 
+set_target_properties(assistant PROPERTIES
+    QT_TARGET_DESCRIPTION "Qt Assistant"
+)
 
 #### Keys ignored in scope 1:.:.:assistant.pro:<TRUE>:
 # PROJECTNAME = "Assistant"
-# QMAKE_TARGET_DESCRIPTION = "Qt" "Assistant"
 
 ## Scopes:
 #####################################################################
@@ -141,6 +142,18 @@ qt_extend_target(assistant CONDITION NOT BROWSER___equals___qtwebkit
         BROWSER_QTEXTBROWSER
 )
 
+if(WIN32)
+    set_target_properties(assistant PROPERTIES
+        QT_TARGET_RC_ICONS "${CMAKE_CURRENT_SOURCE_DIR}/assistant.ico"
+    )
+endif()
+
+if(WIN32)
+    set_target_properties(assistant PROPERTIES
+        QT_TARGET_VERSION "${PROJECT_VERSION}.0"
+    )
+endif()
+
 qt_extend_target(assistant CONDITION WIN32
     SOURCES
         stdinlistener_win.cpp stdinlistener_win.h
@@ -148,14 +161,31 @@ qt_extend_target(assistant CONDITION WIN32
         shell32
 )
 
+if(UNIX)
+    set_target_properties(assistant PROPERTIES
+        QT_TARGET_VERSION "${PROJECT_VERSION}"
+    )
+endif()
+
 qt_extend_target(assistant CONDITION UNIX
     SOURCES
         stdinlistener.cpp stdinlistener.h
 )
 
-#### Keys ignored in scope 11:.:.:assistant.pro:APPLE:
-# ICON = "assistant.icns"
-# QMAKE_INFO_PLIST = "Info_mac.plist"
+if(APPLE)
+    set_target_properties(assistant PROPERTIES
+        MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info_mac.plist"
+        MACOSX_BUNDLE TRUE
+        MACOSX_BUNDLE_ICON_FILE "assistant.icns"
+        OUTPUT_NAME "Assistant"
+    )
+    set_source_files_properties(assistant.icns PROPERTIES
+        MACOSX_PACKAGE_LOCATION Resources
+    )
+    target_sources(assistant PRIVATE
+        assistant.icns
+    )
+endif()
 qt_add_docs(assistant
     doc/qtassistant.qdocconf
 )
diff --git a/src/assistant/assistant/CMakeLists.txt b/src/assistant/assistant/CMakeLists.txt
index 196eed867..d8a56090c 100644
--- a/src/assistant/assistant/CMakeLists.txt
+++ b/src/assistant/assistant/CMakeLists.txt
@@ -1,11 +1,10 @@
 # Generated from assistant.pro.
 
 #####################################################################
-## assistant Binary:
+## assistant App:
 #####################################################################
 
-qt_add_executable(assistant
-    GUI
+qt_internal_add_app(assistant
     SOURCES
         ../../shared/fontpanel/fontpanel.cpp ../../shared/fontpanel/fontpanel.h
         ../shared/collectionconfiguration.cpp ../shared/collectionconfiguration.h
@@ -107,10 +106,12 @@ qt_add_resource(assistant "assistant_images"
         ${assistant_images_resource_files}
 )
 
+set_target_properties(assistant PROPERTIES
+    QT_TARGET_DESCRIPTION "Qt Assistant"
+)
 
 #### Keys ignored in scope 1:.:.:assistant.pro:<TRUE>:
 # PROJECTNAME = "Assistant"
-# QMAKE_TARGET_DESCRIPTION = "Qt" "Assistant"
 
 ## Scopes:
 #####################################################################
@@ -142,6 +143,18 @@ qt_extend_target(assistant CONDITION NOT BROWSER___equals___qtwebkit
         BROWSER_QTEXTBROWSER
 )
 
+if(WIN32)
+    set_target_properties(assistant PROPERTIES
+        QT_TARGET_RC_ICONS "${CMAKE_CURRENT_SOURCE_DIR}/assistant.ico"
+    )
+endif()
+
+if(WIN32)
+    set_target_properties(assistant PROPERTIES
+        QT_TARGET_VERSION "${PROJECT_VERSION}.0"
+    )
+endif()
+
 qt_extend_target(assistant CONDITION WIN32
     SOURCES
         stdinlistener_win.cpp stdinlistener_win.h
@@ -149,14 +162,36 @@ qt_extend_target(assistant CONDITION WIN32
         shell32
 )
 
+if(UNIX)
+    set_target_properties(assistant PROPERTIES
+        QT_TARGET_VERSION "${PROJECT_VERSION}"
+    )
+endif()
+
 qt_extend_target(assistant CONDITION UNIX
     SOURCES
         stdinlistener.cpp stdinlistener.h
 )
 
-#### Keys ignored in scope 11:.:.:assistant.pro:APPLE:
-# ICON = "assistant.icns"
-# QMAKE_INFO_PLIST = "Info_mac.plist"
+if(APPLE)
+    set_target_properties(assistant PROPERTIES
+        MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info_mac.plist"
+        MACOSX_BUNDLE TRUE
+        MACOSX_BUNDLE_ICON_FILE "assistant.icns"
+        OUTPUT_NAME "Assistant"
+    )
+    set_source_files_properties(assistant.icns PROPERTIES
+        MACOSX_PACKAGE_LOCATION Resources
+    )
+    target_sources(assistant PRIVATE
+        assistant.icns
+    )
+    # special case end
+    # Set values to be replaced in the custom Info_mac.plist.
+    set(ICON "assistant.icns")
+    set(EXECUTABLE "Assistant")
+    # special case end
+endif()
 qt_add_docs(assistant
     doc/qtassistant.qdocconf
 )
diff --git a/src/designer/src/designer/.prev_CMakeLists.txt b/src/designer/src/designer/.prev_CMakeLists.txt
new file mode 100644
index 000000000..c1933a92f
--- /dev/null
+++ b/src/designer/src/designer/.prev_CMakeLists.txt
@@ -0,0 +1,158 @@
+# Generated from designer.pro.
+
+#####################################################################
+## designer App:
+#####################################################################
+
+qt_internal_add_app(designer
+    SOURCES
+        ../../../shared/fontpanel/fontpanel.cpp ../../../shared/fontpanel/fontpanel.h
+        ../../../shared/qttoolbardialog/qttoolbardialog.cpp ../../../shared/qttoolbardialog/qttoolbardialog.h ../../../shared/qttoolbardialog/qttoolbardialog.ui
+        appfontdialog.cpp appfontdialog.h
+        assistantclient.cpp assistantclient.h
+        designer_enums.h
+        main.cpp
+        mainwindow.cpp mainwindow.h
+        newform.cpp newform.h
+        preferencesdialog.cpp preferencesdialog.h preferencesdialog.ui
+        qdesigner.cpp qdesigner.h
+        qdesigner_actions.cpp qdesigner_actions.h
+        qdesigner_appearanceoptions.cpp qdesigner_appearanceoptions.h qdesigner_appearanceoptions.ui
+        qdesigner_formwindow.cpp qdesigner_formwindow.h
+        qdesigner_server.cpp qdesigner_server.h
+        qdesigner_settings.cpp qdesigner_settings.h
+        qdesigner_toolwindow.cpp qdesigner_toolwindow.h
+        qdesigner_workbench.cpp qdesigner_workbench.h
+        saveformastemplate.cpp saveformastemplate.h saveformastemplate.ui
+        versiondialog.cpp versiondialog.h
+    INCLUDE_DIRECTORIES
+        ../../../shared/fontpanel
+        ../../../shared/qttoolbardialog
+        ../lib/extension
+        ../lib/sdk
+        ../lib/shared
+        extra
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::DesignerComponentsPrivate
+        Qt::DesignerPrivate
+        Qt::Gui
+        Qt::Network
+        Qt::Widgets
+        Qt::Xml
+    ENABLE_AUTOGEN_TOOLS
+        uic
+    PRECOMPILED_HEADER
+        "qdesigner_pch.h"
+)
+
+# Resources:
+set(designer_resource_files
+    "images/designer.png"
+)
+
+qt_add_resource(designer "designer"
+    PREFIX
+        "/qt-project.org/designer"
+    FILES
+        ${designer_resource_files}
+)
+set_source_files_properties("../../../shared/qttoolbardialog/images/back.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/back.png"
+)
+set_source_files_properties("../../../shared/qttoolbardialog/images/down.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/down.png"
+)
+set_source_files_properties("../../../shared/qttoolbardialog/images/forward.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/forward.png"
+)
+set_source_files_properties("../../../shared/qttoolbardialog/images/minus.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/minus.png"
+)
+set_source_files_properties("../../../shared/qttoolbardialog/images/plus.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/plus.png"
+)
+set_source_files_properties("../../../shared/qttoolbardialog/images/up.png"
+    PROPERTIES QT_RESOURCE_ALIAS "images/up.png"
+)
+set(qttoolbardialog_resource_files
+    "images/back.png"
+    "images/down.png"
+    "images/forward.png"
+    "images/minus.png"
+    "images/plus.png"
+    "images/up.png"
+)
+
+qt_add_resource(designer "qttoolbardialog"
+    PREFIX
+        "/qt-project.org/qttoolbardialog"
+    BASE
+        "../../../shared/qttoolbardialog"
+    FILES
+        ${qttoolbardialog_resource_files}
+)
+
+set_target_properties(designer PROPERTIES
+    QT_TARGET_DESCRIPTION "Qt Designer"
+)
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(designer CONDITION TARGET Qt::PrintSupport
+    PUBLIC_LIBRARIES
+        Qt::PrintSupport
+)
+
+qt_extend_target(designer CONDITION QT_CONFIG___contains___static
+    DEFINES
+        QT_DESIGNER_STATIC
+)
+
+if(WIN32)
+    set_target_properties(designer PROPERTIES
+        QT_TARGET_RC_ICONS "${CMAKE_CURRENT_SOURCE_DIR}/designer.ico"
+    )
+endif()
+
+if(WIN32)
+    set_target_properties(designer PROPERTIES
+        QT_TARGET_VERSION "${PROJECT_VERSION}.0"
+    )
+endif()
+
+if(UNIX)
+    set_target_properties(designer PROPERTIES
+        QT_TARGET_VERSION "${PROJECT_VERSION}"
+    )
+endif()
+
+if(APPLE)
+    set_target_properties(designer PROPERTIES
+        MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info_mac.plist"
+        MACOSX_BUNDLE TRUE
+        MACOSX_BUNDLE_ICON_FILE "designer.icns"
+        OUTPUT_NAME "Designer"
+    )
+    set_source_files_properties(designer.icns PROPERTIES
+        MACOSX_PACKAGE_LOCATION Resources
+    )
+    target_sources(designer PRIVATE
+        designer.icns
+    )
+endif()
+
+#### Keys ignored in scope 6:.:.:designer.pro:APPLE:
+# FILETYPES.files = "uifile.icns"
+# FILETYPES.path = "Contents/Resources"
+# QMAKE_BUNDLE_DATA = "FILETYPES"
+
+qt_extend_target(designer CONDITION UNIX AND NOT HAIKU AND NOT MACOS
+    PUBLIC_LIBRARIES
+        m
+)
+qt_add_docs(designer
+    doc/qtdesigner.qdocconf
+)
+
diff --git a/src/designer/src/designer/CMakeLists.txt b/src/designer/src/designer/CMakeLists.txt
index be0ea16f1..cc938f58d 100644
--- a/src/designer/src/designer/CMakeLists.txt
+++ b/src/designer/src/designer/CMakeLists.txt
@@ -1,11 +1,10 @@
 # Generated from designer.pro.
 
 #####################################################################
-## designer Binary:
+## designer App:
 #####################################################################
 
-qt_add_executable(designer
-    GUI
+qt_internal_add_app(designer
     SOURCES
         ../../../shared/fontpanel/fontpanel.cpp ../../../shared/fontpanel/fontpanel.h
         ../../../shared/qttoolbardialog/qttoolbardialog.cpp ../../../shared/qttoolbardialog/qttoolbardialog.h ../../../shared/qttoolbardialog/qttoolbardialog.ui
@@ -94,9 +93,9 @@ qt_add_resource(designer "qttoolbardialog"
         ${qttoolbardialog_resource_files}
 )
 
-
-#### Keys ignored in scope 1:.:.:designer.pro:<TRUE>:
-# QMAKE_TARGET_DESCRIPTION = "Qt" "Designer"
+set_target_properties(designer PROPERTIES
+    QT_TARGET_DESCRIPTION "Qt Designer"
+)
 
 ## Scopes:
 #####################################################################
@@ -111,19 +110,51 @@ qt_extend_target(designer CONDITION QT_CONFIG___contains___static
         QT_DESIGNER_STATIC
 )
 
-#### Keys ignored in scope 4:.:.:designer.pro:WIN32:
-# RC_ICONS = "designer.ico"
-# VERSION = "$${QT_VERSION}.0"
+if(WIN32)
+    set_target_properties(designer PROPERTIES
+        QT_TARGET_RC_ICONS "${CMAKE_CURRENT_SOURCE_DIR}/designer.ico"
+    )
+endif()
+
+if(WIN32)
+    set_target_properties(designer PROPERTIES
+        QT_TARGET_VERSION "${PROJECT_VERSION}.0"
+    )
+endif()
+
+if(UNIX)
+    set_target_properties(designer PROPERTIES
+        QT_TARGET_VERSION "${PROJECT_VERSION}"
+    )
+endif()
 
-#### Keys ignored in scope 5:.:.:designer.pro:else:
-# VERSION = "$${QT_VERSION}"
+if(APPLE)
+    set_target_properties(designer PROPERTIES
+        MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info_mac.plist"
+        MACOSX_BUNDLE TRUE
+        MACOSX_BUNDLE_ICON_FILE "designer.icns"
+        OUTPUT_NAME "Designer"
+    )
+    set_source_files_properties(designer.icns PROPERTIES
+        MACOSX_PACKAGE_LOCATION Resources
+    )
+    target_sources(designer PRIVATE
+        designer.icns
+    )
+    # special case end
+    # Set values to be replaced in the custom Info_mac.plist.
+    # Also package the uifile.icns.
+    set(ICON "designer.icns")
+    set(EXECUTABLE "Designer")
+    set_source_files_properties(uifile.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+    target_sources(designer PRIVATE uifile.icns)
+    # special case end
+endif()
 
 #### Keys ignored in scope 6:.:.:designer.pro:APPLE:
 # FILETYPES.files = "uifile.icns"
 # FILETYPES.path = "Contents/Resources"
-# ICON = "designer.icns"
 # QMAKE_BUNDLE_DATA = "FILETYPES"
-# QMAKE_INFO_PLIST = "Info_mac.plist"
 
 qt_extend_target(designer CONDITION UNIX AND NOT HAIKU AND NOT MACOS
     PUBLIC_LIBRARIES
diff --git a/src/distancefieldgenerator/CMakeLists.txt b/src/distancefieldgenerator/CMakeLists.txt
index 1713627fd..606ef5378 100644
--- a/src/distancefieldgenerator/CMakeLists.txt
+++ b/src/distancefieldgenerator/CMakeLists.txt
@@ -1,11 +1,10 @@
 # Generated from distancefieldgenerator.pro.
 
 #####################################################################
-## qdistancefieldgenerator Binary:
+## qdistancefieldgenerator App:
 #####################################################################
 
-qt_add_executable(qdistancefieldgenerator
-    GUI
+qt_internal_add_app(qdistancefieldgenerator
     SOURCES
         distancefieldmodel.cpp distancefieldmodel.h
         distancefieldmodelworker.cpp distancefieldmodelworker.h
@@ -24,9 +23,11 @@ qt_add_executable(qdistancefieldgenerator
     ENABLE_AUTOGEN_TOOLS
         uic
 )
+set_target_properties(qdistancefieldgenerator PROPERTIES
+    QT_TARGET_DESCRIPTION "Qt Distance Field Generator"
+)
 
 #### Keys ignored in scope 1:.:.:distancefieldgenerator.pro:<TRUE>:
-# QMAKE_TARGET_DESCRIPTION = "Qt Distance Field Generator"
 # QT_FOR_CONFIG = "tools-private"
 # _REQUIREMENTS = "qtConfig(distancefieldgenerator)"
 qt_add_docs(qdistancefieldgenerator
diff --git a/src/kmap2qmap/CMakeLists.txt b/src/kmap2qmap/CMakeLists.txt
index bc11e973a..3dcf76641 100644
--- a/src/kmap2qmap/CMakeLists.txt
+++ b/src/kmap2qmap/CMakeLists.txt
@@ -1,15 +1,18 @@
 # Generated from kmap2qmap.pro.
 
 #####################################################################
-## kmap2qmap Binary:
+## kmap2qmap App:
 #####################################################################
 
-qt_add_executable(kmap2qmap
+qt_internal_add_app(kmap2qmap
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
         Qt::InputSupportPrivate
 )
+set_target_properties(kmap2qmap PROPERTIES
+    WIN32_EXECUTABLE FALSE
+)
 
 #### Keys ignored in scope 1:.:.:kmap2qmap.pro:<TRUE>:
 # QT_FOR_CONFIG = "tools-private"
diff --git a/src/linguist/linguist/CMakeLists.txt b/src/linguist/linguist/CMakeLists.txt
index 4e32082c3..e1ebe96cc 100644
--- a/src/linguist/linguist/CMakeLists.txt
+++ b/src/linguist/linguist/CMakeLists.txt
@@ -1,11 +1,10 @@
 # Generated from linguist.pro.
 
 #####################################################################
-## linguist Binary:
+## linguist App:
 #####################################################################
 
-qt_add_executable(linguist
-    GUI
+qt_internal_add_app(linguist
     SOURCES
         ../shared/numerus.cpp
         ../shared/po.cpp
@@ -126,10 +125,13 @@ qt_add_resource(linguist "linguist"
         ${linguist_resource_files}
 )
 
+set_target_properties(linguist PROPERTIES
+    QT_TARGET_DESCRIPTION "Qt Linguist"
+)
 
 #### Keys ignored in scope 1:.:.:linguist.pro:<TRUE>:
+# INSTALLS = "phrasebooks"
 # PROJECTNAME = "Qt" "Linguist"
-# QMAKE_TARGET_DESCRIPTION = "Qt" "Linguist"
 # phrasebooks.files = "$$PWD/../phrasebooks/*"
 # phrasebooks.path = "$$[QT_INSTALL_DATA]/phrasebooks"
 
@@ -141,16 +143,38 @@ qt_extend_target(linguist CONDITION QT_PRODUCT___contains___OpenSource._x_
         QT_OPENSOURCE
 )
 
-#### Keys ignored in scope 3:.:.:linguist.pro:WIN32:
-# RC_ICONS = "linguist.ico"
-# VERSION = "$${QT_VERSION}.0"
+if(WIN32)
+    set_target_properties(linguist PROPERTIES
+        QT_TARGET_RC_ICONS "${CMAKE_CURRENT_SOURCE_DIR}/linguist.ico"
+    )
+endif()
+
+if(WIN32)
+    set_target_properties(linguist PROPERTIES
+        QT_TARGET_VERSION "${PROJECT_VERSION}.0"
+    )
+endif()
 
-#### Keys ignored in scope 4:.:.:linguist.pro:else:
-# VERSION = "$${QT_VERSION}"
+if(UNIX)
+    set_target_properties(linguist PROPERTIES
+        QT_TARGET_VERSION "${PROJECT_VERSION}"
+    )
+endif()
 
-#### Keys ignored in scope 5:.:.:linguist.pro:APPLE:
-# ICON = "linguist.icns"
-# QMAKE_INFO_PLIST = "Info_mac.plist"
+if(APPLE)
+    set_target_properties(linguist PROPERTIES
+        MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info_mac.plist"
+        MACOSX_BUNDLE TRUE
+        MACOSX_BUNDLE_ICON_FILE "linguist.icns"
+        OUTPUT_NAME "Linguist"
+    )
+    set_source_files_properties(linguist.icns PROPERTIES
+        MACOSX_PACKAGE_LOCATION Resources
+    )
+    target_sources(linguist PRIVATE
+        linguist.icns
+    )
+endif()
 qt_add_docs(linguist
     doc/qtlinguist.qdocconf
 )
diff --git a/src/macdeployqt/macchangeqt/CMakeLists.txt b/src/macdeployqt/macchangeqt/CMakeLists.txt
index 5b79e91f7..d6fe040d0 100644
--- a/src/macdeployqt/macchangeqt/CMakeLists.txt
+++ b/src/macdeployqt/macchangeqt/CMakeLists.txt
@@ -1,11 +1,10 @@
 # Generated from macchangeqt.pro.
 
 #####################################################################
-## macchangeqt Binary:
+## macchangeqt App:
 #####################################################################
 
-qt_add_executable(macchangeqt
-    GUI
+qt_internal_add_app(macchangeqt
     SOURCES
         ../shared/shared.cpp
         main.cpp
diff --git a/src/macdeployqt/macdeployqt/CMakeLists.txt b/src/macdeployqt/macdeployqt/CMakeLists.txt
index fd03e28b8..0c63a877f 100644
--- a/src/macdeployqt/macdeployqt/CMakeLists.txt
+++ b/src/macdeployqt/macdeployqt/CMakeLists.txt
@@ -1,11 +1,10 @@
 # Generated from macdeployqt.pro.
 
 #####################################################################
-## macdeployqt Binary:
+## macdeployqt App:
 #####################################################################
 
-qt_add_executable(macdeployqt
-    GUI
+qt_internal_add_app(macdeployqt
     SOURCES
         ../shared/shared.cpp
         main.cpp
diff --git a/src/pixeltool/CMakeLists.txt b/src/pixeltool/CMakeLists.txt
index 0fe6eea75..eaf3f7a02 100644
--- a/src/pixeltool/CMakeLists.txt
+++ b/src/pixeltool/CMakeLists.txt
@@ -1,11 +1,10 @@
 # Generated from pixeltool.pro.
 
 #####################################################################
-## pixeltool Binary:
+## pixeltool App:
 #####################################################################
 
-qt_add_executable(pixeltool
-    GUI
+qt_internal_add_app(pixeltool
     SOURCES
         main.cpp
         qpixeltool.cpp qpixeltool.h
@@ -23,5 +22,9 @@ qt_add_executable(pixeltool
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:pixeltool.pro:APPLE:
-# QMAKE_INFO_PLIST = "Info_mac.plist"
+if(APPLE)
+    set_target_properties(pixeltool PROPERTIES
+        MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info_mac.plist"
+        MACOSX_BUNDLE TRUE
+    )
+endif()
diff --git a/src/qdbus/qdbus/CMakeLists.txt b/src/qdbus/qdbus/CMakeLists.txt
index 0ab4c32f9..4fcbf5f39 100644
--- a/src/qdbus/qdbus/CMakeLists.txt
+++ b/src/qdbus/qdbus/CMakeLists.txt
@@ -1,11 +1,10 @@
 # Generated from qdbus.pro.
 
 #####################################################################
-## qdbus Binary:
+## qdbus App:
 #####################################################################
 
-qt_add_executable(qdbus
-    GUI
+qt_internal_add_app(qdbus
     SOURCES
         qdbus.cpp
     PUBLIC_LIBRARIES
@@ -15,3 +14,9 @@ qt_add_executable(qdbus
 
 ## Scopes:
 #####################################################################
+
+if(WIN32)
+    set_target_properties(qdbus PROPERTIES
+        WIN32_EXECUTABLE FALSE
+    )
+endif()
diff --git a/src/qdbus/qdbusviewer/.prev_CMakeLists.txt b/src/qdbus/qdbusviewer/.prev_CMakeLists.txt
new file mode 100644
index 000000000..9ffa4a2f7
--- /dev/null
+++ b/src/qdbus/qdbusviewer/.prev_CMakeLists.txt
@@ -0,0 +1,58 @@
+# Generated from qdbusviewer.pro.
+
+#####################################################################
+## qdbusviewer App:
+#####################################################################
+
+qt_internal_add_app(qdbusviewer
+    SOURCES
+        logviewer.cpp logviewer.h
+        main.cpp
+        mainwindow.cpp mainwindow.h
+        propertydialog.cpp propertydialog.h
+        qdbusmodel.cpp qdbusmodel.h
+        qdbusviewer.cpp qdbusviewer.h
+        servicesproxymodel.cpp servicesproxymodel.h
+    PUBLIC_LIBRARIES
+        Qt::DBusPrivate
+        Qt::Gui
+        Qt::Widgets
+        Qt::Xml
+)
+
+# Resources:
+set(qdbusviewer_resource_files
+    "images/qdbusviewer-128.png"
+    "images/qdbusviewer.png"
+)
+
+qt_add_resource(qdbusviewer "qdbusviewer"
+    PREFIX
+        "/qt-project.org/qdbusviewer"
+    FILES
+        ${qdbusviewer_resource_files}
+)
+
+
+## Scopes:
+#####################################################################
+
+if(APPLE)
+    set_target_properties(qdbusviewer PROPERTIES
+        MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info_mac.plist"
+        MACOSX_BUNDLE TRUE
+        MACOSX_BUNDLE_ICON_FILE "qdbusviewer.icns"
+    )
+    set_source_files_properties(images/qdbusviewer.icns PROPERTIES
+        MACOSX_PACKAGE_LOCATION Resources
+    )
+    target_sources(qdbusviewer PRIVATE
+        images/qdbusviewer.icns
+    )
+endif()
+
+if(WIN32)
+    set_target_properties(qdbusviewer PROPERTIES
+        QT_TARGET_WINDOWS_RC_FILE "${CMAKE_CURRENT_SOURCE_DIR}/qdbusviewer.rc"
+    )
+endif()
diff --git a/src/qdbus/qdbusviewer/CMakeLists.txt b/src/qdbus/qdbusviewer/CMakeLists.txt
index 64fbc27e3..2006d3921 100644
--- a/src/qdbus/qdbusviewer/CMakeLists.txt
+++ b/src/qdbus/qdbusviewer/CMakeLists.txt
@@ -1,11 +1,10 @@
 # Generated from qdbusviewer.pro.
 
 #####################################################################
-## qdbusviewer Binary:
+## qdbusviewer App:
 #####################################################################
 
-qt_add_executable(qdbusviewer
-    GUI
+qt_internal_add_app(qdbusviewer
     SOURCES
         logviewer.cpp logviewer.h
         main.cpp
@@ -38,9 +37,27 @@ qt_add_resource(qdbusviewer "qdbusviewer"
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:qdbusviewer.pro:APPLE:
-# ICON = "images/qdbusviewer.icns"
-# QMAKE_INFO_PLIST = "Info_mac.plist"
-
-#### Keys ignored in scope 3:.:.:qdbusviewer.pro:WIN32:
-# RC_FILE = "qdbusviewer.rc"
+if(APPLE)
+    set_target_properties(qdbusviewer PROPERTIES
+        MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info_mac.plist"
+        MACOSX_BUNDLE TRUE
+        MACOSX_BUNDLE_ICON_FILE "qdbusviewer.icns"
+    )
+    set_source_files_properties(images/qdbusviewer.icns PROPERTIES
+        MACOSX_PACKAGE_LOCATION Resources
+    )
+    target_sources(qdbusviewer PRIVATE
+        images/qdbusviewer.icns
+    )
+    # special case end
+    # Set values to be replaced in the custom Info_mac.plist.
+    set(ICON "qdbusviewer.icns")
+    set(EXECUTABLE "qdbusviewer")
+    # special case end
+endif()
+
+if(WIN32)
+    set_target_properties(qdbusviewer PROPERTIES
+        QT_TARGET_WINDOWS_RC_FILE "${CMAKE_CURRENT_SOURCE_DIR}/qdbusviewer.rc"
+    )
+endif()
diff --git a/src/qev/CMakeLists.txt b/src/qev/CMakeLists.txt
index 458bfb173..54c4eda74 100644
--- a/src/qev/CMakeLists.txt
+++ b/src/qev/CMakeLists.txt
@@ -1,11 +1,10 @@
 # Generated from qev.pro.
 
 #####################################################################
-## qev Binary:
+## qev App:
 #####################################################################
 
-qt_add_executable(qev
-    GUI
+qt_internal_add_app(qev
     SOURCES
         qev.cpp
     PUBLIC_LIBRARIES
diff --git a/src/qtdiag/.prev_CMakeLists.txt b/src/qtdiag/.prev_CMakeLists.txt
index 9afb33dab..fe53247d9 100644
--- a/src/qtdiag/.prev_CMakeLists.txt
+++ b/src/qtdiag/.prev_CMakeLists.txt
@@ -1,10 +1,10 @@
 # Generated from qtdiag.pro.
 
 #####################################################################
-## qtdiag Binary:
+## qtdiag App:
 #####################################################################
 
-qt_add_executable(qtdiag
+qt_internal_add_app(qtdiag
     SOURCES
         main.cpp
         qtdiag.cpp qtdiag.h
@@ -13,6 +13,9 @@ qt_add_executable(qtdiag
         Qt::Gui
         Qt::GuiPrivate
 )
+set_target_properties(qtdiag PROPERTIES
+    WIN32_EXECUTABLE FALSE
+)
 
 #### Keys ignored in scope 1:.:.:qtdiag.pro:<TRUE>:
 # QT_FOR_CONFIG = "tools-private"
diff --git a/src/qtdiag/CMakeLists.txt b/src/qtdiag/CMakeLists.txt
index a9cf14ae0..fb98d4b07 100644
--- a/src/qtdiag/CMakeLists.txt
+++ b/src/qtdiag/CMakeLists.txt
@@ -1,10 +1,10 @@
 # Generated from qtdiag.pro.
 
 #####################################################################
-## qtdiag Binary:
+## qtdiag App:
 #####################################################################
 
-qt_add_executable(qtdiag
+qt_internal_add_app(qtdiag
     SOURCES
         main.cpp
         qtdiag.cpp qtdiag.h
@@ -13,6 +13,9 @@ qt_add_executable(qtdiag
         # Qt::Gui # special case QTBUG-83498
         # Qt::GuiPrivate # special case QTBUG-83498
 )
+set_target_properties(qtdiag PROPERTIES
+    WIN32_EXECUTABLE FALSE
+)
 
 #### Keys ignored in scope 1:.:.:qtdiag.pro:<TRUE>:
 # QT_FOR_CONFIG = "tools-private"
diff --git a/src/qtpaths/CMakeLists.txt b/src/qtpaths/CMakeLists.txt
index db169aad8..70d4d155f 100644
--- a/src/qtpaths/CMakeLists.txt
+++ b/src/qtpaths/CMakeLists.txt
@@ -1,11 +1,10 @@
 # Generated from qtpaths.pro.
 
 #####################################################################
-## qtpaths Binary:
+## qtpaths App:
 #####################################################################
 
-qt_add_executable(qtpaths
-    GUI
+qt_internal_add_app(qtpaths
     SOURCES
         qtpaths.cpp
 )
@@ -16,3 +15,9 @@ qt_add_executable(qtpaths
 
 ## Scopes:
 #####################################################################
+
+if(WIN32)
+    set_target_properties(qtpaths PROPERTIES
+        WIN32_EXECUTABLE FALSE
+    )
+endif()
diff --git a/src/qtplugininfo/CMakeLists.txt b/src/qtplugininfo/CMakeLists.txt
index fe03fdaaa..cfc583428 100644
--- a/src/qtplugininfo/CMakeLists.txt
+++ b/src/qtplugininfo/CMakeLists.txt
@@ -1,13 +1,16 @@
 # Generated from qtplugininfo.pro.
 
 #####################################################################
-## qtplugininfo Binary:
+## qtplugininfo App:
 #####################################################################
 
-qt_add_executable(qtplugininfo
+qt_internal_add_app(qtplugininfo
     SOURCES
         qtplugininfo.cpp
 )
+set_target_properties(qtplugininfo PROPERTIES
+    WIN32_EXECUTABLE FALSE
+)
 
 #### Keys ignored in scope 1:.:.:qtplugininfo.pro:<TRUE>:
 # QT_FOR_CONFIG = "tools-private"
diff --git a/tests/auto/qtattributionsscanner/CMakeLists.txt b/tests/auto/qtattributionsscanner/CMakeLists.txt
index 5d3ccf927..c76353323 100644
--- a/tests/auto/qtattributionsscanner/CMakeLists.txt
+++ b/tests/auto/qtattributionsscanner/CMakeLists.txt
@@ -10,4 +10,4 @@ qt_add_test(tst_qtattributionsscanner
 )
 
 #### Keys ignored in scope 1:.:.:qtattributionsscanner.pro:<TRUE>:
-# DISTFILES = "testdata/good/minimal/qt_attribution.json" "testdata/good/complete/qt_attribution.json" "testdata/good/expected.json" "testdata/good/expected.error" "testdata/warnings/incomplete/qt_attribution.json" "testdata/warnings/incomplete/expected.json" "testdata/warnings/incomplete/expected.error" "testdata/warnings/unknown/qt_attribution.json" "testdata/warnings/unknown/expected.json" "testdata/warnings/unknown/expected.error"
+# DISTFILES = "testdata/good/expected.json" "testdata/good/expected.error" "testdata/good/minimal/qt_attribution_test.json" "testdata/good/minimal/expected.json" "testdata/good/minimal/expected.error" "testdata/good/complete/qt_attribution_test.json" "testdata/good/complete/expected.json" "testdata/good/complete/expected.error" "testdata/good/variants/qt_attribution_test.json" "testdata/good/variants/expected.json" "testdata/good/variants/expected.error" "testdata/warnings/incomplete/qt_attribution_test.json" "testdata/warnings/incomplete/expected.json" "testdata/warnings/incomplete/expected.error" "testdata/warnings/unknown/qt_attribution_test.json" "testdata/warnings/unknown/expected.json" "testdata/warnings/unknown/expected.error"