forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -32,6 +32,7 @@
|
||||
#include "ui_genericlinuxdeviceconfigurationwidget.h"
|
||||
|
||||
#include <coreplugin/coreconstants.h>
|
||||
#include <coreplugin/coreicons.h>
|
||||
#include <utils/portlist.h>
|
||||
#include <utils/fancylineedit.h>
|
||||
#include <ssh/sshconnection.h>
|
||||
@@ -191,7 +192,7 @@ void GenericLinuxDeviceConfigurationWidget::initGui()
|
||||
m_ui->machineTypeValueLabel->setText(tr("Physical Device"));
|
||||
else
|
||||
m_ui->machineTypeValueLabel->setText(tr("Emulator"));
|
||||
m_ui->portsWarningLabel->setPixmap(QPixmap(QLatin1String(Core::Constants::ICON_ERROR)));
|
||||
m_ui->portsWarningLabel->setPixmap(Core::Icons::ERROR.pixmap());
|
||||
m_ui->portsWarningLabel->setToolTip(QLatin1String("<font color=\"red\">")
|
||||
+ tr("You will need at least one port.") + QLatin1String("</font>"));
|
||||
m_ui->keyFileLineEdit->setExpectedKind(PathChooser::File);
|
||||
|
||||
Reference in New Issue
Block a user