Move app logo to main executable

Moves more branding information out of the plugins.

Change-Id: I71575f268dd8f2860f4da56101b0e3d9442df367
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

cmake/QtCreatorIDEBranding.cmake

@@ -16,6 +16,6 @@ set(IDE_DOC_FILE_ONLINE "qtcreator/qtcreator-online.qdocconf")
 # Absolute, or relative to <qtcreator>/src/app
 # Should contain qtcreator.ico, qtcreator.xcassets
 set(IDE_ICON_PATH "")
-# Absolute, or relative to <qtcreator>/src/plugins/coreplugin
+# Absolute, or relative to <qtcreator>/src/app
 # Should contain images/logo/(16|24|32|48|64|128|256|512)/QtProject-qtcreator.png
 set(IDE_LOGO_PATH "")

src/app/CMakeLists.txt

@@ -4,11 +4,17 @@ if(NOT IS_ABSOLUTE "${IDE_ICON_PATH}")
   set(IDE_ICON_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${IDE_ICON_PATH}")
 endif()
 
+if (NOT IS_ABSOLUTE ${IDE_LOGO_PATH})
+  set(IDE_LOGO_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${IDE_LOGO_PATH}")
+endif()
+configure_file(app_logo.qrc.cmakein app_logo_cmake.qrc)
+
 add_qtc_executable(qtcreator
   DEFINES IDE_LIBRARY_BASENAME=\"${IDE_LIBRARY_BASE_PATH}\"
   DEPENDS Aggregation ExtensionSystem Qt::Core Qt::Widgets Utils shared_qtsingleapplication app_version
   SOURCES
     main.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/app_logo_cmake.qrc
     ../tools/qtcreatorcrashhandler/crashhandlersetup.cpp ../tools/qtcreatorcrashhandler/crashhandlersetup.h
   PROPERTIES
     WIN32_EXECUTABLE ON
@@ -145,3 +151,13 @@ if(BUILD_WITH_CRASHPAD)
     DESTINATION "${IDE_LIBEXEC_PATH}"
   )
 endif()
+
+if ((NOT WIN32) AND (NOT APPLE))
+  # install logo
+  foreach(size 16 24 32 48 64 128 256 512)
+    install(
+      FILES ${IDE_LOGO_PATH}/images/logo/${size}/QtProject-qtcreator.png
+      DESTINATION share/icons/hicolor/${size}x${size}/apps
+    )
+  endforeach()
+endif()

src/app/app.qbs

@@ -52,6 +52,7 @@ QtcProduct {
 
     files: [
         "app-Info.plist",
+        "app_logo.qrc",
         "main.cpp",
         "qtcreator.xcassets",
         "../shared/qtsingleapplication/qtsingleapplication.h",

src/plugins/coreplugin/CMakeLists.txt

@@ -1,13 +1,7 @@
-if (NOT IS_ABSOLUTE ${IDE_LOGO_PATH})
-  set(IDE_LOGO_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${IDE_LOGO_PATH}")
-endif()
-configure_file(core_logo.qrc.cmakein core_logo_cmake.qrc)
-
 add_qtc_plugin(Core
   DEPENDS Qt::PrintSupport Qt::Qml Qt::Sql Qt::Gui Qt::GuiPrivate
   PUBLIC_DEPENDS Aggregation ExtensionSystem Utils
   SOURCES
-    ${CMAKE_CURRENT_BINARY_DIR}/core_logo_cmake.qrc
     actionmanager/actioncontainer.cpp
     actionmanager/actioncontainer.h
     actionmanager/actioncontainer_p.h
@@ -343,16 +337,6 @@ extend_qtc_plugin(Core
   DEFINES ENABLE_CRASHPAD
 )
 
-if ((NOT WIN32) AND (NOT APPLE))
-  # install logo
-  foreach(size 16 24 32 48 64 128 256 512)
-    install(
-      FILES ${IDE_LOGO_PATH}/images/logo/${size}/QtProject-qtcreator.png
-      DESTINATION share/icons/hicolor/${size}x${size}/apps
-    )
-  endforeach()
-endif()
-
 set(FONTS_BASE "${QtCreator_SOURCE_DIR}/src/share/3rdparty/studiofonts/")
 qt_add_resources(Core
   CoreWelcomeScreenFonts_rcc

src/plugins/coreplugin/coreplugin.qbs

@@ -37,7 +37,6 @@ Project {
                 "basefilewizardfactory.h",
                 "core.qrc",
                 "core_global.h",
-                "core_logo.qrc",
                 "coreconstants.h",
                 "coreicons.cpp",
                 "coreicons.h",

src/plugins/plugins.qbs

@@ -26,7 +26,6 @@ Project {
         "conan/conan.qbs",
         "copilot/copilot.qbs",
         "coreplugin/coreplugin.qbs",
-        "coreplugin/images/logo/logo.qbs",
         "cpaster/cpaster.qbs",
         "cpaster/frontend/frontend.qbs",
         "cppcheck/cppcheck.qbs",

src/src.qbs

@@ -8,6 +8,7 @@ Project {
     references: [
         "app/app.qbs",
         "app/app_version_header.qbs",
+        "app/images/logo/logo.qbs",
         "libs/libs.qbs",
         "plugins/plugins.qbs",
         "tools/tools.qbs",