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

Qmake: Use direct access to build config from system when available

Browse Source 
Change-Id: Ic514fb73db90f0868679d04efba62c40e28b7b59
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-02-06 18:59:02 +01:00
parent 3894dbfa65
commit e9f2178a4a
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -661,18 +661,15 @@ QtSupport::ProFileReader *QmakeBuildSystem::createProFileReader(const QmakeProFi
m_qmakeGlobals = std::make_unique<QMakeGlobals>(); m_qmakeGlobals = std::make_unique<QMakeGlobals>();
m_qmakeGlobalsRefCnt = 0; m_qmakeGlobalsRefCnt = 0;
Environment env = Environment::systemEnvironment();
QStringList qmakeArgs; QStringList qmakeArgs;
Target *t = target(); Target *t = target();
Kit *k = t->kit(); Kit *k = t->kit();
if (auto bc = static_cast<QmakeBuildConfiguration *>(t->activeBuildConfiguration())) { Environment env = m_buildConfiguration->environment();
env = bc->environment(); if (QMakeStep *qs = m_buildConfiguration->qmakeStep())
if (QMakeStep *qs = bc->qmakeStep())
qmakeArgs = qs->parserArguments(); qmakeArgs = qs->parserArguments();
else else
qmakeArgs = bc->configCommandLineArguments(); qmakeArgs = m_buildConfiguration->configCommandLineArguments();
}
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(k); QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(k);
m_qmakeSysroot = SysRootKitAspect::sysRoot(k).toString(); m_qmakeSysroot = SysRootKitAspect::sysRoot(k).toString();