diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-08-19 14:29:14 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-08-20 12:39:16 +0000 |
| commit | 6d3f236aab08833bda44e1f1528c8a44db864651 (patch) | |
| tree | 53d651d85d9873c60ade5746eeb5b13cf624069b /src/plugins/cmakeprojectmanager/cmakebuildstep.cpp | |
| parent | 30dc401429cb8151a738cf33da587ae49db38d58 (diff) | |
Utils::Environment: Use expanded values
The Environment class is supposed to support values with references to
other variables, but we failed to actually expand them in most places.
Fixes: QTCREATORBUG-22687
Change-Id: I108cb59d3b4571471423455240f6f4f1cf64bf05
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakebuildstep.cpp')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildstep.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index ecaefda599d..45fd5745832 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -192,7 +192,7 @@ bool CMakeBuildStep::init() pp->setMacroExpander(bc->macroExpander()); Utils::Environment env = bc->environment(); Utils::Environment::setupEnglishOutput(&env); - if (!env.value("NINJA_STATUS").startsWith(m_ninjaProgressString)) + if (!env.expandedValueForKey("NINJA_STATUS").startsWith(m_ninjaProgressString)) env.set("NINJA_STATUS", m_ninjaProgressString + "%o/sec] "); pp->setEnvironment(env); pp->setWorkingDirectory(bc->buildDirectory()); |