Commit ea9b7fb5 authored by Felix Geyer's avatar Felix Geyer Committed by Daniel Molkentin

On unix: install the application icons according to the freedesktop spec.

This allows desktop environments to pick the right icon size when displaying
the Qt Creator menu entry.

Change-Id: I10f6b46fb99202571d081a5e6e4d680be7ca069f
Merge-request: 328
Reviewed-by: default avatarDaniel Molkentin <daniel.molkentin@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/64
parent 566ae4cc
......@@ -144,7 +144,7 @@ QString LoggerMode::name() const
QIcon LoggerMode::icon() const
{
return QIcon(QLatin1String(":/core/images/qtcreator_logo_32.png"));
return QIcon(QLatin1String(":/core/images/logo/32/qtcreator.png"));
}
......
......@@ -147,7 +147,7 @@ The \bold {icon()} method returns a logo for the new mode selector.
\code
QIcon LoggerMode::icon() const
{
return QIcon(QLatin1String(":/core/images/qtcreator_logo_32.png"));
return QIcon(QLatin1String(":/core/images/logo/32/qtcreator.png"));
}
\endcode
......
......@@ -13,8 +13,8 @@
<file>images/filesave.png</file>
<file>images/find.png</file>
<file>images/findnext.png</file>
<file>images/qtcreator_logo_128.png</file>
<file>images/qtcreator_logo_32.png</file>
<file>images/logo/128/qtcreator.png</file>
<file>images/logo/32/qtcreator.png</file>
<file>images/inputfield.png</file>
<file>images/inputfield_disabled.png</file>
<file>images/linkicon.png</file>
......
......@@ -234,8 +234,8 @@ const char * const ICON_CLOSE_DARK = ":/core/images/darkclosebutton.png";
const char * const ICON_SPLIT_HORIZONTAL = ":/core/images/splitbutton_horizontal.png";
const char * const ICON_FILTER = ":/core/images/filtericon.png";
const char * const ICON_LINK = ":/core/images/linkicon.png";
const char * const ICON_QTLOGO_32 = ":/core/images/qtcreator_logo_32.png";
const char * const ICON_QTLOGO_128 = ":/core/images/qtcreator_logo_128.png";
const char * const ICON_QTLOGO_32 = ":/core/images/logo/32/qtcreator.png";
const char * const ICON_QTLOGO_128 = ":/core/images/logo/128/qtcreator.png";
const char * const WIZARD_CATEGORY_QT = "R.Qt";
const char * const WIZARD_TR_CATEGORY_QT = QT_TRANSLATE_NOOP("Core", "Qt");
......
......@@ -213,9 +213,13 @@ else:macx {
else:unix {
SOURCES += progressmanager/progressmanager_x11.cpp
images.files = images/qtcreator_logo_*.png
images.path = /share/pixmaps
INSTALLS += images
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}.path = /share/icons/hicolor/$${imagesize}x$${imagesize}/apps)
INSTALLS += image$${imagesize}
}
}
OTHER_FILES += editormanager/BinFiles.mimetypes.xml ide_version.h.in
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment