diff options
| author | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2015-11-23 16:41:54 +0100 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2015-11-25 12:30:52 +0000 |
| commit | 033862f3057818df3123d07fc6cb34e193250c53 (patch) | |
| tree | 884de0b3b8ac16e548e4f585bd8c821aa890f8b4 /src/plugins/projectexplorer/buildprogress.cpp | |
| parent | 00c75cd7ebde4f191c15e92550db369163a95b68 (diff) | |
Themed Icons: Introduce Utils::Icon
Instead of describing icons via file name or in the themed icons case
via
a string that is a list of mask/color pairs, we have now a class for it.
Icons are now listed in per-plugin *icons.h headers.
RunControl::m_icon was The only place left where an icon property was in
fact a string. This patch changes that member to be a Utils::Icon.
Change-Id: Ibcfa8bb25e6d2e330c567ee7ccc0b97ead603177
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/projectexplorer/buildprogress.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/buildprogress.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/projectexplorer/buildprogress.cpp b/src/plugins/projectexplorer/buildprogress.cpp index c44194a952..219fbbff1c 100644 --- a/src/plugins/projectexplorer/buildprogress.cpp +++ b/src/plugins/projectexplorer/buildprogress.cpp @@ -31,9 +31,8 @@ #include "buildprogress.h" #include "projectexplorerconstants.h" -#include <coreplugin/coreconstants.h> +#include <coreplugin/coreicons.h> #include <utils/stylehelper.h> -#include <utils/themehelper.h> #include <QVBoxLayout> #include <QHBoxLayout> @@ -88,10 +87,8 @@ BuildProgress::BuildProgress(TaskWindow *taskWindow, Qt::Orientation orientation m_errorIcon->setAlignment(Qt::AlignRight); m_warningIcon->setAlignment(Qt::AlignRight); - m_errorIcon->setPixmap(Utils::ThemeHelper::themedIconPixmap( - QLatin1String(Core::Constants::ICON_ERROR))); - m_warningIcon->setPixmap(Utils::ThemeHelper::themedIconPixmap( - QLatin1String(Core::Constants::ICON_WARNING))); + m_errorIcon->setPixmap(Core::Icons::ERROR.pixmap()); + m_warningIcon->setPixmap(Core::Icons::WARNING.pixmap()); m_contentWidget->hide(); |