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

IncrediBuild: Rework BuildConsoleBuildStep

Browse Source 
Change-Id: I7ab8bc18c229e1d748dbbc494b2ba254085c0e0e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-07-29 07:00:50 +02:00
parent 9c930ac744
commit 5327b91e99
13 changed files with 474 additions and 1072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/projectexplorer/projectconfigurationaspects.cpp
View File

@@ -81,6 +81,7 @@ public:
QPointer<QComboBox> m_comboBox;
QPointer<QLabel> m_label;
QPointer<QButtonGroup> m_buttonGroup;
QString m_tooltip;
};
class BaseStringAspectPrivate
@@ -602,7 +603,9 @@ void BaseSelectionAspect::addToLayout(LayoutBuilder &builder)
break;
case DisplayStyle::ComboBox:
d->m_label = new QLabel(displayName());
d->m_label->setToolTip(d->m_tooltip);
d->m_comboBox = new QComboBox;
d->m_comboBox->setToolTip(d->m_tooltip);
for (int i = 0, n = d->m_options.size(); i < n; ++i)
d->m_comboBox->addItem(d->m_options.at(i).displayName);
connect(d->m_comboBox.data(), QOverload<int>::of(&QComboBox::activated), this,
@@ -648,6 +651,11 @@ void BaseSelectionAspect::setDisplayStyle(BaseSelectionAspect::DisplayStyle styl
d->m_displayStyle = style;
}
void BaseSelectionAspect::setToolTip(const QString &tooltip)
{
d->m_tooltip = tooltip;
}
int BaseSelectionAspect::value() const
{
return d->m_value;
@@ -663,6 +671,11 @@ void BaseSelectionAspect::setValue(int value)
}
}
QString BaseSelectionAspect::stringValue() const
{
return d->m_options.at(d->m_value).displayName;
}
void BaseSelectionAspect::addOption(const QString &displayName, const QString &toolTip)
{
d->m_options.append({displayName, toolTip});