From 1d0b58cd00ca1c0d0d873c93b12a77fd9a43da46 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@digia.com>
Date: Mon, 8 Oct 2012 16:11:06 +0200
Subject: [PATCH] Fix installation of desktop icons.
The icons are referred to with the name QtProject-qtcreator in the
desktop file.
Task-number: QTCREATORBUG-7955
Change-Id: Iaf6e270acdf0ac3259169dc39943bc78e33e0d96
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
src/plugins/coreplugin/core.qrc | 4 ++--
src/plugins/coreplugin/coreconstants.h | 4 ++--
src/plugins/coreplugin/coreplugin.pro | 2 +-
.../{qtcreator.png => QtProject-qtcreator.png} | Bin
.../{qtcreator.png => QtProject-qtcreator.png} | Bin
.../{qtcreator.png => QtProject-qtcreator.png} | Bin
.../{qtcreator.png => QtProject-qtcreator.png} | Bin
.../{qtcreator.png => QtProject-qtcreator.png} | Bin
.../{qtcreator.png => QtProject-qtcreator.png} | Bin
.../{qtcreator.png => QtProject-qtcreator.png} | Bin
.../{qtcreator.png => QtProject-qtcreator.png} | Bin
src/plugins/coreplugin/images/logo/logo.qbs | 16 ++++++++--------
12 files changed, 13 insertions(+), 13 deletions(-)
rename src/plugins/coreplugin/images/logo/128/{qtcreator.png => QtProject-qtcreator.png} (100%)
rename src/plugins/coreplugin/images/logo/16/{qtcreator.png => QtProject-qtcreator.png} (100%)
rename src/plugins/coreplugin/images/logo/24/{qtcreator.png => QtProject-qtcreator.png} (100%)
rename src/plugins/coreplugin/images/logo/256/{qtcreator.png => QtProject-qtcreator.png} (100%)
rename src/plugins/coreplugin/images/logo/32/{qtcreator.png => QtProject-qtcreator.png} (100%)
rename src/plugins/coreplugin/images/logo/48/{qtcreator.png => QtProject-qtcreator.png} (100%)
rename src/plugins/coreplugin/images/logo/512/{qtcreator.png => QtProject-qtcreator.png} (100%)
rename src/plugins/coreplugin/images/logo/64/{qtcreator.png => QtProject-qtcreator.png} (100%)
diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index 79cfaa2f1b2..82727a3a80a 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -13,8 +13,8 @@
<file>images/filesave.png</file>
<file>images/find.png</file>
<file>images/findnext.png</file>
- <file>images/logo/128/qtcreator.png</file>
- <file>images/logo/32/qtcreator.png</file>
+ <file>images/logo/128/QtProject-qtcreator.png</file>
+ <file>images/logo/32/QtProject-qtcreator.png</file>
<file>images/inputfield.png</file>
<file>images/inputfield_disabled.png</file>
<file>images/linkicon.png</file>
diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h
index 03b1d9bcf04..4dad78b1848 100644
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -205,8 +205,8 @@ const char ICON_CLOSE_SPLIT_LEFT[] = ":/core/images/splitbutton_closeleft.png"
const char ICON_CLOSE_SPLIT_RIGHT[] = ":/core/images/splitbutton_closeright.png";
const char ICON_FILTER[] = ":/core/images/filtericon.png";
const char ICON_LINK[] = ":/core/images/linkicon.png";
-const char ICON_QTLOGO_32[] = ":/core/images/logo/32/qtcreator.png";
-const char ICON_QTLOGO_128[] = ":/core/images/logo/128/qtcreator.png";
+const char ICON_QTLOGO_32[] = ":/core/images/logo/32/QtProject-qtcreator.png";
+const char ICON_QTLOGO_128[] = ":/core/images/logo/128/QtProject-qtcreator.png";
const char WIZARD_CATEGORY_QT[] = "R.Qt";
const char WIZARD_TR_CATEGORY_QT[] = QT_TRANSLATE_NOOP("Core", "Qt");
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index 1d4dfe998ce..381f6a6e573 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -236,7 +236,7 @@ else:unix {
IMAGE_SIZE_LIST = 16 24 32 48 64 128 256 512
for(imagesize, IMAGE_SIZE_LIST) {
- eval(image$${imagesize}.files = images/logo/$${imagesize}/qtcreator.png)
+ eval(image$${imagesize}.files = images/logo/$${imagesize}/QtProject-qtcreator.png)
eval(image$${imagesize}.path = $$QTC_PREFIX/share/icons/hicolor/$${imagesize}x$${imagesize}/apps)
INSTALLS += image$${imagesize}
}
diff --git a/src/plugins/coreplugin/images/logo/128/qtcreator.png b/src/plugins/coreplugin/images/logo/128/QtProject-qtcreator.png
similarity index 100%
rename from src/plugins/coreplugin/images/logo/128/qtcreator.png
rename to src/plugins/coreplugin/images/logo/128/QtProject-qtcreator.png
diff --git a/src/plugins/coreplugin/images/logo/16/qtcreator.png b/src/plugins/coreplugin/images/logo/16/QtProject-qtcreator.png
similarity index 100%
rename from src/plugins/coreplugin/images/logo/16/qtcreator.png
rename to src/plugins/coreplugin/images/logo/16/QtProject-qtcreator.png
diff --git a/src/plugins/coreplugin/images/logo/24/qtcreator.png b/src/plugins/coreplugin/images/logo/24/QtProject-qtcreator.png
similarity index 100%
rename from src/plugins/coreplugin/images/logo/24/qtcreator.png
rename to src/plugins/coreplugin/images/logo/24/QtProject-qtcreator.png
diff --git a/src/plugins/coreplugin/images/logo/256/qtcreator.png b/src/plugins/coreplugin/images/logo/256/QtProject-qtcreator.png
similarity index 100%
rename from src/plugins/coreplugin/images/logo/256/qtcreator.png
rename to src/plugins/coreplugin/images/logo/256/QtProject-qtcreator.png
diff --git a/src/plugins/coreplugin/images/logo/32/qtcreator.png b/src/plugins/coreplugin/images/logo/32/QtProject-qtcreator.png
similarity index 100%
rename from src/plugins/coreplugin/images/logo/32/qtcreator.png
rename to src/plugins/coreplugin/images/logo/32/QtProject-qtcreator.png
diff --git a/src/plugins/coreplugin/images/logo/48/qtcreator.png b/src/plugins/coreplugin/images/logo/48/QtProject-qtcreator.png
similarity index 100%
rename from src/plugins/coreplugin/images/logo/48/qtcreator.png
rename to src/plugins/coreplugin/images/logo/48/QtProject-qtcreator.png
diff --git a/src/plugins/coreplugin/images/logo/512/qtcreator.png b/src/plugins/coreplugin/images/logo/512/QtProject-qtcreator.png
similarity index 100%
rename from src/plugins/coreplugin/images/logo/512/qtcreator.png
rename to src/plugins/coreplugin/images/logo/512/QtProject-qtcreator.png
diff --git a/src/plugins/coreplugin/images/logo/64/qtcreator.png b/src/plugins/coreplugin/images/logo/64/QtProject-qtcreator.png
similarity index 100%
rename from src/plugins/coreplugin/images/logo/64/qtcreator.png
rename to src/plugins/coreplugin/images/logo/64/QtProject-qtcreator.png
diff --git a/src/plugins/coreplugin/images/logo/logo.qbs b/src/plugins/coreplugin/images/logo/logo.qbs
index 6a1c2f6e3e7..71737dcffc8 100644
--- a/src/plugins/coreplugin/images/logo/logo.qbs
+++ b/src/plugins/coreplugin/images/logo/logo.qbs
@@ -8,48 +8,48 @@ Product {
Group {
qbs.installDir: "share/icons/hicolor/16x16/apps"
fileTags: ["install"]
- files: ["16/qtcreator.png"]
+ files: ["16/QtProject-qtcreator.png"]
}
Group {
qbs.installDir: "share/icons/hicolor/24x24/apps"
fileTags: ["install"]
- files: ["24/qtcreator.png"]
+ files: ["24/QtProject-qtcreator.png"]
}
Group {
qbs.installDir: "share/icons/hicolor/32x32/apps"
fileTags: ["install"]
- files: ["32/qtcreator.png"]
+ files: ["32/QtProject-qtcreator.png"]
}
Group {
qbs.installDir: "share/icons/hicolor/48x48/apps"
fileTags: ["install"]
- files: ["48/qtcreator.png"]
+ files: ["48/QtProject-qtcreator.png"]
}
Group {
qbs.installDir: "share/icons/hicolor/64x64/apps"
fileTags: ["install"]
- files: ["64/qtcreator.png"]
+ files: ["64/QtProject-qtcreator.png"]
}
Group {
qbs.installDir: "share/icons/hicolor/128x128/apps"
fileTags: ["install"]
- files: ["128/qtcreator.png"]
+ files: ["128/QtProject-qtcreator.png"]
}
Group {
qbs.installDir: "share/icons/hicolor/256x256/apps"
fileTags: ["install"]
- files: ["256/qtcreator.png"]
+ files: ["256/QtProject-qtcreator.png"]
}
Group {
qbs.installDir: "share/icons/hicolor/512x512/apps"
fileTags: ["install"]
- files: ["512/qtcreator.png"]
+ files: ["512/QtProject-qtcreator.png"]
}
}
--
GitLab