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>

13 files changed, 91 insertions, 0 deletions

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 2d39c219f9..8e19bacc68 100644
--- a/src/app/CMakeLists.txt
+++ b/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()
diff --git a/src/app/app.qbs b/src/app/app.qbs
index a0b30ae2ae..8bce23f642 100644
--- a/src/app/app.qbs
+++ b/src/app/app.qbs
@@ -52,6 +52,7 @@ QtcProduct {
 
     files: [
         "app-Info.plist",
+        "app_logo.qrc",
         "main.cpp",
         "qtcreator.xcassets",
         "../shared/qtsingleapplication/qtsingleapplication.h",
diff --git a/src/app/app_logo.qrc b/src/app/app_logo.qrc
new file mode 100644
index 0000000000..4e9d9c8757
--- /dev/null
+++ b/src/app/app_logo.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/core">
+        <file alias="images/qtcreatorlogo-big.png">images/logo/128/QtProject-qtcreator.png</file>
+        <file alias="images/qtcreatorlogo-big@2x.png">images/logo/256/QtProject-qtcreator.png</file>
+    </qresource>
+</RCC>
diff --git a/src/app/app_logo.qrc.cmakein b/src/app/app_logo.qrc.cmakein
new file mode 100644
index 0000000000..f595e10703
--- /dev/null
+++ b/src/app/app_logo.qrc.cmakein
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/core">
+    <file alias="images/qtcreatorlogo-big.png">${IDE_LOGO_PATH}/images/logo/128/QtProject-qtcreator.png</file>
+    <file alias="images/qtcreatorlogo-big@2x.png">${IDE_LOGO_PATH}/images/logo/256/QtProject-qtcreator.png</file>
+    </qresource>
+</RCC>
diff --git a/src/app/images/logo/128/QtProject-qtcreator.png b/src/app/images/logo/128/QtProject-qtcreator.png
new file mode 100644
index 0000000000..53a42c20fe
--- /dev/null
+++ b/src/app/images/logo/128/QtProject-qtcreator.png
diff --git a/src/app/images/logo/16/QtProject-qtcreator.png b/src/app/images/logo/16/QtProject-qtcreator.png
new file mode 100644
index 0000000000..d48df57e63
--- /dev/null
+++ b/src/app/images/logo/16/QtProject-qtcreator.png
diff --git a/src/app/images/logo/24/QtProject-qtcreator.png b/src/app/images/logo/24/QtProject-qtcreator.png
new file mode 100644
index 0000000000..449c740a11
--- /dev/null
+++ b/src/app/images/logo/24/QtProject-qtcreator.png
diff --git a/src/app/images/logo/256/QtProject-qtcreator.png b/src/app/images/logo/256/QtProject-qtcreator.png
new file mode 100644
index 0000000000..3a9cf292bc
--- /dev/null
+++ b/src/app/images/logo/256/QtProject-qtcreator.png
diff --git a/src/app/images/logo/32/QtProject-qtcreator.png b/src/app/images/logo/32/QtProject-qtcreator.png
new file mode 100644
index 0000000000..87ab1ba5cb
--- /dev/null
+++ b/src/app/images/logo/32/QtProject-qtcreator.png
diff --git a/src/app/images/logo/48/QtProject-qtcreator.png b/src/app/images/logo/48/QtProject-qtcreator.png
new file mode 100644
index 0000000000..43a6834a14
--- /dev/null
+++ b/src/app/images/logo/48/QtProject-qtcreator.png
diff --git a/src/app/images/logo/512/QtProject-qtcreator.png b/src/app/images/logo/512/QtProject-qtcreator.png
new file mode 100644
index 0000000000..acbb5a5134
--- /dev/null
+++ b/src/app/images/logo/512/QtProject-qtcreator.png
diff --git a/src/app/images/logo/64/QtProject-qtcreator.png b/src/app/images/logo/64/QtProject-qtcreator.png
new file mode 100644
index 0000000000..1a89d932f5
--- /dev/null
+++ b/src/app/images/logo/64/QtProject-qtcreator.png
diff --git a/src/app/images/logo/logo.qbs b/src/app/images/logo/logo.qbs
new file mode 100644
index 0000000000..09780ee514
--- /dev/null
+++ b/src/app/images/logo/logo.qbs
@@ -0,0 +1,62 @@
+import qbs 1.0
+
+Product {
+    condition: qbs.targetOS.contains("linux")
+    name: "LogoImages"
+
+    Group {
+        name: "16x16"
+        qbs.install: true
+        qbs.installDir: "share/icons/hicolor/16x16/apps"
+        files: ["16/QtProject-qtcreator.png"]
+    }
+
+    Group {
+        name: "24x24"
+        qbs.install: true
+        qbs.installDir: "share/icons/hicolor/24x24/apps"
+        files: ["24/QtProject-qtcreator.png"]
+    }
+
+    Group {
+        name: "32x32"
+        qbs.install: true
+        qbs.installDir: "share/icons/hicolor/32x32/apps"
+        files: ["32/QtProject-qtcreator.png"]
+    }
+
+    Group {
+        name: "48x48"
+        qbs.install: true
+        qbs.installDir: "share/icons/hicolor/48x48/apps"
+        files: ["48/QtProject-qtcreator.png"]
+    }
+
+    Group {
+        name: "64x64"
+        qbs.install: true
+        qbs.installDir: "share/icons/hicolor/64x64/apps"
+        files: ["64/QtProject-qtcreator.png"]
+    }
+
+    Group {
+        name: "128x128"
+        qbs.install: true
+        qbs.installDir: "share/icons/hicolor/128x128/apps"
+        files: ["128/QtProject-qtcreator.png"]
+    }
+
+    Group {
+        name: "256x256"
+        qbs.install: true
+        qbs.installDir: "share/icons/hicolor/256x256/apps"
+        files: ["256/QtProject-qtcreator.png"]
+    }
+
+    Group {
+        name: "512x512"
+        qbs.install: true
+        qbs.installDir: "share/icons/hicolor/512x512/apps"
+        files: ["512/QtProject-qtcreator.png"]
+    }
+}