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

QmakeProjectManager: Make "system" execution opt-in

Browse Source 
It has too many side effects.
Amends fcd6384f4d.
T_SYSTEM and E_SYSTEM are now treated the same.

Fixes: QTCREATORBUG-24551
Change-Id: Ib6df2762d329f2ddc0dd66190454159d446a9ac9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Christian Kandeler
2020-10-15 17:07:00 +02:00
parent d1b0c12d6b
commit dd62254e4e
9 changed files with 65 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/utils/aspects.cpp
View File

@@ -1161,13 +1161,14 @@ void IntegerAspect::setToolTip(const QString &tooltip)
Its visual representation is a QComboBox with three items.
*/
TriStateAspect::TriStateAspect()
TriStateAspect::TriStateAspect(const QString onString, const QString &offString,
const QString &defaultString)
{
setDisplayStyle(DisplayStyle::ComboBox);
setDefaultValue(2);
addOption(tr("Enable"));
addOption(tr("Disable"));
addOption(tr("Leave at Default"));
addOption(onString);
addOption(offString);
addOption(defaultString);
}
TriState TriStateAspect::setting() const