diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-06-04 16:50:48 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-06-05 12:11:21 +0200 |
| commit | 40b31335ce8aa31d1d4f816c8cb779a0e868e304 (patch) | |
| tree | e6ebe4ca20191901aad4196bc703ad212f316796 /src/plugins/projectexplorer/buildconfiguration.cpp | |
| parent | 9e39fa7ab4fec7b37f90193a09f83f5f917a7baa (diff) | |
| download | qt-creator-40b31335ce8aa31d1d4f816c8cb779a0e868e304.tar.gz | |
Fix return value of project explorers macro expanders
They would claim that a variable that has an empty value is not a valid
variable and should not be replaced with that empty value.
Change-Id: I5ee9b950b611f8878efe2f86ac5b219d51194d48
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/projectexplorer/buildconfiguration.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/buildconfiguration.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index 3ecfb78e2a..e4d4bc5485 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -72,8 +72,9 @@ bool BuildConfigMacroExpander::resolveMacro(const QString &name, QString *ret) *ret = m_bc->buildDirectory().toUserOutput(); return true; } - *ret = Core::VariableManager::value(name.toUtf8()); - return !ret->isEmpty(); + bool found; + *ret = Core::VariableManager::value(name.toUtf8(), &found); + return found; } } // namespace Internal |