diff options
| author | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2016-03-22 14:19:02 +0100 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2016-03-23 08:57:59 +0000 |
| commit | 22a262e8f6807b6c2f85501111517f8824a8a460 (patch) | |
| tree | b7521ab56bff4a10cfa091659aac748bf021e2a2 /src/plugins/projectexplorer/miniprojecttargetselector.cpp | |
| parent | c371166904bec4a86d47ccdf59fd58d54e91e46c (diff) | |
| download | qt-creator-22a262e8f6807b6c2f85501111517f8824a8a460.tar.gz | |
ProjectExplorer: Flat desktop device icon for flat themes
This change flattens the desktop device icon in the mode bar. Only for
themes which set the FlatSideBarIcons flag.
":///DESKTOP///" deduplicates to Constants::DESKTOP_DEVICE_ICON
Change-Id: Ie31d9c501db2a1e36edbfac59abdd22a4d8c6773
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/projectexplorer/miniprojecttargetselector.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/miniprojecttargetselector.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp index 506f457564..98f207e737 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp +++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp @@ -28,6 +28,7 @@ #include "kitconfigwidget.h" #include "kitmanager.h" #include "target.h" +#include "projectexplorericons.h" #include <utils/algorithm.h> #include <utils/styledbar.h> @@ -664,7 +665,9 @@ MiniProjectTargetSelector::MiniProjectTargetSelector(QAction *targetSelectorActi setContentsMargins(QMargins(0, 1, 1, 8)); setWindowFlags(Qt::Popup); - targetSelectorAction->setIcon(style()->standardIcon(QStyle::SP_ComputerIcon)); + targetSelectorAction->setIcon(creatorTheme()->flag(Theme::FlatSideBarIcons) + ? Icons::DESKTOP_DEVICE.icon() + : style()->standardIcon(QStyle::SP_ComputerIcon)); targetSelectorAction->setProperty("titledAction", true); m_kitAreaWidget = new KitAreaWidget(this); @@ -1500,7 +1503,9 @@ void MiniProjectTargetSelector::updateActionAndSummary() QString buildConfig; QString deployConfig; QString runConfig; - QIcon targetIcon = style()->standardIcon(QStyle::SP_ComputerIcon); + QIcon targetIcon = creatorTheme()->flag(Theme::FlatSideBarIcons) + ? Icons::DESKTOP_DEVICE.icon() + : style()->standardIcon(QStyle::SP_ComputerIcon); Project *project = SessionManager::startupProject(); if (project) { |