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

Qmake: Add special CONFIG variable "qtc_run" when parsing project files

Browse Source 
The idea is that some of the more intrusive prf files in Qt can skip
themselves when they encounter this condition.

Task-number: QTCREATORBUG-17521
Change-Id: I09a33b2d3c5dee1232803d46c521cc9fd29e1898
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Christian Kandeler
2019-02-27 09:32:09 +01:00
parent eecf75e7bf
commit 86e16c9e14
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
View File

@@ -1246,6 +1246,7 @@ static bool evaluateOne(const QmakeEvalInput &input, ProFile *pro,
QStringList basecfgs = reader->values(build + QLatin1String(".CONFIG")); QStringList basecfgs = reader->values(build + QLatin1String(".CONFIG"));
basecfgs += build; basecfgs += build;
basecfgs += QLatin1String("build_pass"); basecfgs += QLatin1String("build_pass");
basecfgs += "qtc_run";
basevars[QLatin1String("BUILD_PASS")] = QStringList(build); basevars[QLatin1String("BUILD_PASS")] = QStringList(build);
QStringList buildname = reader->values(build + QLatin1String(".name")); QStringList buildname = reader->values(build + QLatin1String(".name"));
basevars[QLatin1String("BUILD_NAME")] = (buildname.isEmpty() ? QStringList(build) : buildname); basevars[QLatin1String("BUILD_NAME")] = (buildname.isEmpty() ? QStringList(build) : buildname);

1
src/plugins/qtsupport/profilereader.cpp
View File

@@ -79,6 +79,7 @@ ProFileReader::ProFileReader(QMakeGlobals *option, QMakeVfs *vfs)
, ProFileEvaluator(option, this, vfs, this) , ProFileEvaluator(option, this, vfs, this)
, m_ignoreLevel(0) , m_ignoreLevel(0)
{ {
setExtraConfigs(QStringList("qtc_run"));
} }
ProFileReader::~ProFileReader() ProFileReader::~ProFileReader()