diff options
author | hjk <hjk@qt.io> | 2020-02-06 18:59:02 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-02-07 10:55:34 +0000 |
commit | e9f2178a4a81c79256eb75f5081b729d193029e8 (patch) | |
tree | 83fcb19bd6d07fd5ae8540e1a3803e5b6e079a62 /src/plugins/qmakeprojectmanager | |
parent | 3894dbfa6562566b09dbabe7bb34193c78af00a5 (diff) |
Qmake: Use direct access to build config from system when available
Change-Id: Ic514fb73db90f0868679d04efba62c40e28b7b59
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/qmakeprojectmanager')
-rw-r--r-- | src/plugins/qmakeprojectmanager/qmakeproject.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index c8473198e73..40ab552a654 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -661,18 +661,15 @@ QtSupport::ProFileReader *QmakeBuildSystem::createProFileReader(const QmakeProFi m_qmakeGlobals = std::make_unique<QMakeGlobals>(); m_qmakeGlobalsRefCnt = 0; - Environment env = Environment::systemEnvironment(); QStringList qmakeArgs; Target *t = target(); Kit *k = t->kit(); - if (auto bc = static_cast<QmakeBuildConfiguration *>(t->activeBuildConfiguration())) { - env = bc->environment(); - if (QMakeStep *qs = bc->qmakeStep()) - qmakeArgs = qs->parserArguments(); - else - qmakeArgs = bc->configCommandLineArguments(); - } + Environment env = m_buildConfiguration->environment(); + if (QMakeStep *qs = m_buildConfiguration->qmakeStep()) + qmakeArgs = qs->parserArguments(); + else + qmakeArgs = m_buildConfiguration->configCommandLineArguments(); QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(k); m_qmakeSysroot = SysRootKitAspect::sysRoot(k).toString(); |