feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Move icons to Utils

Browse Source 
This way we can use them from libraries, not only from plugins.

Change-Id: Ic35cfd5f04d638d87606bf272b2c00ded1267c1b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Ulf Hermann
2016-08-03 17:55:54 +02:00
parent 5d6f5ff2c9
commit 15fbfaf2e9
214 changed files with 598 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
View File

@@ -34,7 +34,6 @@
#include "ui_qbsbuildstepconfigwidget.h"
#include <coreplugin/icore.h>
#include <coreplugin/coreicons.h>
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/kit.h>
#include <projectexplorer/projectexplorerconstants.h>
@@ -42,6 +41,7 @@
#include <qtsupport/qtversionmanager.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <utils/utilsicons.h>
#include <qbs.h>
@@ -477,7 +477,7 @@ QbsBuildStepConfigWidget::QbsBuildStepConfigWidget(QbsBuildStep *step) :
QString *errorMessage) {
return validateProperties(edit, errorMessage);
});
m_ui->qmlDebuggingWarningText->setPixmap(Core::Icons::WARNING.pixmap());
m_ui->qmlDebuggingWarningText->setPixmap(Utils::Icons::WARNING.pixmap());
connect(m_ui->buildVariantComboBox,
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),

4
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
View File

@@ -29,7 +29,6 @@
#include "qbsinstallstep.h"
#include "qbsproject.h"
#include <coreplugin/coreicons.h>
#include <coreplugin/messagemanager.h>
#include <projectexplorer/buildmanager.h>
#include <projectexplorer/buildstep.h>
@@ -50,6 +49,7 @@
#include <qtsupport/qtsupportconstants.h>
#include <qtsupport/qtkitinformation.h>
#include <utils/hostosinfo.h>
#include <utils/utilsicons.h>
#include "api/runenvironment.h"
@@ -342,7 +342,7 @@ QbsRunConfigurationWidget::QbsRunConfigurationWidget(QbsRunConfiguration *rc)
auto hl = new QHBoxLayout();
hl->addStretch();
m_disabledIcon = new QLabel(this);
m_disabledIcon->setPixmap(Core::Icons::WARNING.pixmap());
m_disabledIcon->setPixmap(Utils::Icons::WARNING.pixmap());
hl->addWidget(m_disabledIcon);
m_disabledReason = new QLabel(this);
m_disabledReason->setVisible(false);