From 09a965cf6c1ba35175e24eb78bc0424f97aae183 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Fri, 5 Aug 2016 13:49:37 +0200 Subject: [PATCH] move QTCREATORLOGO_BIG back to coreplugin It was a regression from the "Move icons to Utils" commit which broke qbs builds. QTCREATORLOGO_BIG aka QtProject-qtcreator.png is only used in coreplugin and have some not moved install logic inside coreplugin.pro Change-Id: I8258b845108f8801581d7ee8d6771808b306a602 Reviewed-by: Ulf Hermann --- src/libs/utils/utils.qrc | 2 -- src/libs/utils/utilsicons.h | 2 -- src/plugins/coreplugin/core.qrc | 3 ++- src/plugins/coreplugin/coreicons.cpp | 2 ++ src/plugins/coreplugin/coreicons.h | 1 + .../images/logo/128/QtProject-qtcreator.png | Bin .../images/logo/16/QtProject-qtcreator.png | Bin .../images/logo/24/QtProject-qtcreator.png | Bin .../images/logo/256/QtProject-qtcreator.png | Bin .../images/logo/32/QtProject-qtcreator.png | Bin .../images/logo/48/QtProject-qtcreator.png | Bin .../images/logo/512/QtProject-qtcreator.png | Bin .../images/logo/64/QtProject-qtcreator.png | Bin .../coreplugin}/images/logo/logo.qbs | 0 src/plugins/coreplugin/mainwindow.cpp | 3 ++- src/plugins/coreplugin/versiondialog.cpp | 5 +++-- 16 files changed, 10 insertions(+), 8 deletions(-) rename src/{libs/utils => plugins/coreplugin}/images/logo/128/QtProject-qtcreator.png (100%) rename src/{libs/utils => plugins/coreplugin}/images/logo/16/QtProject-qtcreator.png (100%) rename src/{libs/utils => plugins/coreplugin}/images/logo/24/QtProject-qtcreator.png (100%) rename src/{libs/utils => plugins/coreplugin}/images/logo/256/QtProject-qtcreator.png (100%) rename src/{libs/utils => plugins/coreplugin}/images/logo/32/QtProject-qtcreator.png (100%) rename src/{libs/utils => plugins/coreplugin}/images/logo/48/QtProject-qtcreator.png (100%) rename src/{libs/utils => plugins/coreplugin}/images/logo/512/QtProject-qtcreator.png (100%) rename src/{libs/utils => plugins/coreplugin}/images/logo/64/QtProject-qtcreator.png (100%) rename src/{libs/utils => plugins/coreplugin}/images/logo/logo.qbs (100%) diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc index ac3129ec17e..f1c5a72b8c8 100644 --- a/src/libs/utils/utils.qrc +++ b/src/libs/utils/utils.qrc @@ -45,8 +45,6 @@ images/fileopen.png images/filesave.png images/filesave@2x.png - images/logo/128/QtProject-qtcreator.png - images/logo/256/QtProject-qtcreator.png images/inputfield.png images/inputfield@2x.png images/inputfield_disabled.png diff --git a/src/libs/utils/utilsicons.h b/src/libs/utils/utilsicons.h index b730af00758..6c8a31a07ac 100644 --- a/src/libs/utils/utilsicons.h +++ b/src/libs/utils/utilsicons.h @@ -86,8 +86,6 @@ const Icon RESET_TOOLBAR({ {QLatin1String(":/utils/images/reset.png"), Theme::IconsBaseColor}}); const Icon DARK_CLOSE( QLatin1String(":/utils/images/darkclose.png")); -const Icon QTCREATORLOGO_BIG( - QLatin1String(":/utils/images/qtcreatorlogo-big.png")); const Icon ARROW_UP({ {QLatin1String(":/utils/images/arrowup.png"), Theme::IconsBaseColor}}); diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index c131b817b03..55532386602 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -1,5 +1,6 @@ - + images/logo/128/QtProject-qtcreator.png + images/logo/256/QtProject-qtcreator.png diff --git a/src/plugins/coreplugin/coreicons.cpp b/src/plugins/coreplugin/coreicons.cpp index d4b48d90adf..516d95d9362 100644 --- a/src/plugins/coreplugin/coreicons.cpp +++ b/src/plugins/coreplugin/coreicons.cpp @@ -30,6 +30,8 @@ using namespace Utils; namespace Core { namespace Icons { +const Icon QTCREATORLOGO_BIG( + QLatin1String(":/core/images/qtcreatorlogo-big.png")); const Icon FIND_CASE_INSENSITIVELY( QLatin1String(":/find/images/casesensitively.png")); const Icon FIND_WHOLE_WORD( diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h index be6e40cffc7..412e980814d 100644 --- a/src/plugins/coreplugin/coreicons.h +++ b/src/plugins/coreplugin/coreicons.h @@ -32,6 +32,7 @@ namespace Core { namespace Icons { +CORE_EXPORT extern const Utils::Icon QTCREATORLOGO_BIG; CORE_EXPORT extern const Utils::Icon FIND_CASE_INSENSITIVELY; CORE_EXPORT extern const Utils::Icon FIND_WHOLE_WORD; CORE_EXPORT extern const Utils::Icon FIND_REGEXP; diff --git a/src/libs/utils/images/logo/128/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/128/QtProject-qtcreator.png similarity index 100% rename from src/libs/utils/images/logo/128/QtProject-qtcreator.png rename to src/plugins/coreplugin/images/logo/128/QtProject-qtcreator.png diff --git a/src/libs/utils/images/logo/16/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/16/QtProject-qtcreator.png similarity index 100% rename from src/libs/utils/images/logo/16/QtProject-qtcreator.png rename to src/plugins/coreplugin/images/logo/16/QtProject-qtcreator.png diff --git a/src/libs/utils/images/logo/24/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/24/QtProject-qtcreator.png similarity index 100% rename from src/libs/utils/images/logo/24/QtProject-qtcreator.png rename to src/plugins/coreplugin/images/logo/24/QtProject-qtcreator.png diff --git a/src/libs/utils/images/logo/256/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/256/QtProject-qtcreator.png similarity index 100% rename from src/libs/utils/images/logo/256/QtProject-qtcreator.png rename to src/plugins/coreplugin/images/logo/256/QtProject-qtcreator.png diff --git a/src/libs/utils/images/logo/32/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/32/QtProject-qtcreator.png similarity index 100% rename from src/libs/utils/images/logo/32/QtProject-qtcreator.png rename to src/plugins/coreplugin/images/logo/32/QtProject-qtcreator.png diff --git a/src/libs/utils/images/logo/48/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/48/QtProject-qtcreator.png similarity index 100% rename from src/libs/utils/images/logo/48/QtProject-qtcreator.png rename to src/plugins/coreplugin/images/logo/48/QtProject-qtcreator.png diff --git a/src/libs/utils/images/logo/512/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/512/QtProject-qtcreator.png similarity index 100% rename from src/libs/utils/images/logo/512/QtProject-qtcreator.png rename to src/plugins/coreplugin/images/logo/512/QtProject-qtcreator.png diff --git a/src/libs/utils/images/logo/64/QtProject-qtcreator.png b/src/plugins/coreplugin/images/logo/64/QtProject-qtcreator.png similarity index 100% rename from src/libs/utils/images/logo/64/QtProject-qtcreator.png rename to src/plugins/coreplugin/images/logo/64/QtProject-qtcreator.png diff --git a/src/libs/utils/images/logo/logo.qbs b/src/plugins/coreplugin/images/logo/logo.qbs similarity index 100% rename from src/libs/utils/images/logo/logo.qbs rename to src/plugins/coreplugin/images/logo/logo.qbs diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 83efbe06403..634796aaa12 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -50,6 +50,7 @@ #include "externaltoolmanager.h" #include "editormanager/systemeditor.h" #include "windowsupport.h" +#include "coreicons.h" #include #include @@ -147,7 +148,7 @@ MainWindow::MainWindow() : setWindowTitle(tr("Qt Creator")); if (HostOsInfo::isLinuxHost()) - QApplication::setWindowIcon(Utils::Icons::QTCREATORLOGO_BIG.icon()); + QApplication::setWindowIcon(Icons::QTCREATORLOGO_BIG.icon()); QCoreApplication::setApplicationName(QLatin1String("QtCreator")); QCoreApplication::setApplicationVersion(QLatin1String(Constants::IDE_VERSION_LONG)); QCoreApplication::setOrganizationName(QLatin1String(Constants::IDE_SETTINGSVARIANT_STR)); diff --git a/src/plugins/coreplugin/versiondialog.cpp b/src/plugins/coreplugin/versiondialog.cpp index b58c53f829f..ded2e13dae3 100644 --- a/src/plugins/coreplugin/versiondialog.cpp +++ b/src/plugins/coreplugin/versiondialog.cpp @@ -24,6 +24,7 @@ ****************************************************************************/ #include "versiondialog.h" +#include "coreicons.h" #include #include @@ -48,7 +49,7 @@ VersionDialog::VersionDialog(QWidget *parent) // We need to set the window icon explicitly here since for some reason the // application icon isn't used when the size of the dialog is fixed (at least not on X11/GNOME) if (Utils::HostOsInfo::isLinuxHost()) - setWindowIcon(Utils::Icons::QTCREATORLOGO_BIG.icon()); + setWindowIcon(Icons::QTCREATORLOGO_BIG.icon()); setWindowTitle(tr("About Qt Creator")); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); @@ -102,7 +103,7 @@ VersionDialog::VersionDialog(QWidget *parent) connect(buttonBox , &QDialogButtonBox::rejected, this, &QDialog::reject); QLabel *logoLabel = new QLabel; - logoLabel->setPixmap(Utils::Icons::QTCREATORLOGO_BIG.pixmap()); + logoLabel->setPixmap(Icons::QTCREATORLOGO_BIG.pixmap()); layout->addWidget(logoLabel , 0, 0, 1, 1); layout->addWidget(copyRightLabel, 0, 1, 4, 4); layout->addWidget(buttonBox, 4, 0, 1, 5);