From 779c59a3e6fe6ac13427b6b07e6fa3e2c5bbe3a3 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Wed, 2 Feb 2022 11:27:02 +0100
Subject: [PATCH] CMake build: Fix missing tool button icon

- for the branding feature CMake uses a different, generated qrc file
- move the Qt logo out of the Qt Creator logo files, it doesn't belong
  there

Amends 5eafa345edcd9fa91ab81e2289611d99422c60b8

Fixes: QTCREATORBUG-26969
Change-Id: I6f3d87abd52810d42142073ac944e6553c38caf1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/coreplugin/core.qrc                     |   4 ++--
 src/plugins/coreplugin/core.qrc.cmakein             |   2 ++
 .../{logo/16/Qt_logo_green.png => qtlogo.png}       | Bin
 .../{logo/32/Qt_logo_green.png => qtlogo@2x.png}    | Bin
 4 files changed, 4 insertions(+), 2 deletions(-)
 rename src/plugins/coreplugin/images/{logo/16/Qt_logo_green.png => qtlogo.png} (100%)
 rename src/plugins/coreplugin/images/{logo/32/Qt_logo_green.png => qtlogo@2x.png} (100%)

diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index 3804d793098..4389dba12b3 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -6,7 +6,7 @@
         <file>images/settingscategory_core@2x.png</file>
         <file>images/settingscategory_design.png</file>
         <file>images/settingscategory_design@2x.png</file>
-        <file alias="images/qtlogo.png">images/logo/16/Qt_logo_green.png</file>
-        <file alias="images/qtlogo@2x.png">images/logo/32/Qt_logo_green.png</file>
+        <file>images/qtlogo.png</file>
+        <file>images/qtlogo@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/coreplugin/core.qrc.cmakein b/src/plugins/coreplugin/core.qrc.cmakein
index 6d5cd0bc6d9..dae636db832 100644
--- a/src/plugins/coreplugin/core.qrc.cmakein
+++ b/src/plugins/coreplugin/core.qrc.cmakein
@@ -6,5 +6,7 @@
     <file alias="images/settingscategory_core@2x.png">${CMAKE_CURRENT_SOURCE_DIR}/images/settingscategory_core@2x.png</file>
     <file alias="images/settingscategory_design.png">${CMAKE_CURRENT_SOURCE_DIR}/images/settingscategory_design.png</file>
     <file alias="images/settingscategory_design@2x.png">${CMAKE_CURRENT_SOURCE_DIR}/images/settingscategory_design@2x.png</file>
+    <file alias="images/qtlogo.png">${CMAKE_CURRENT_SOURCE_DIR}/images/qtlogo.png</file>
+    <file alias="images/qtlogo@2x.png">${CMAKE_CURRENT_SOURCE_DIR}/images/qtlogo@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/coreplugin/images/logo/16/Qt_logo_green.png b/src/plugins/coreplugin/images/qtlogo.png
similarity index 100%
rename from src/plugins/coreplugin/images/logo/16/Qt_logo_green.png
rename to src/plugins/coreplugin/images/qtlogo.png
diff --git a/src/plugins/coreplugin/images/logo/32/Qt_logo_green.png b/src/plugins/coreplugin/images/qtlogo@2x.png
similarity index 100%
rename from src/plugins/coreplugin/images/logo/32/Qt_logo_green.png
rename to src/plugins/coreplugin/images/qtlogo@2x.png