diff options
-rw-r--r-- | dist/changes-5.0.2 | 6 | ||||
-rw-r--r-- | qmake/library/qmakeevaluator.cpp | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/dist/changes-5.0.2 b/dist/changes-5.0.2 index b97e71ae03..5e170a35be 100644 --- a/dist/changes-5.0.2 +++ b/dist/changes-5.0.2 @@ -107,6 +107,12 @@ Qt for Windows CE * Tools * **************************************************************************** +qmake +----- + + - $$(VAR) style environment variable expansions will not split on + whitespace any more. Use $$split() if necessary. + **************************************************************************** * Plugins * diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp index ac08acee99..8b6a0f8598 100644 --- a/qmake/library/qmakeevaluator.cpp +++ b/qmake/library/qmakeevaluator.cpp @@ -453,9 +453,9 @@ void QMakeEvaluator::evaluateExpression( break; } case TokEnvVar: { const ProString &var = getStr(tokPtr); - const ProStringList &val = split_value_list(m_option->getEnv(var.toQString(m_tmp1))); - debugMsg(2, "env var %s => %s", dbgStr(var), dbgStrList(val)); - addStrList(val, tok, ret, pending, joined); + const ProString &val = ProString(m_option->getEnv(var.toQString(m_tmp1))); + debugMsg(2, "env var %s => %s", dbgStr(var), dbgStr(val)); + addStr(val, ret, pending, joined); break; } case TokFuncName: { const ProKey &func = getHashStr(tokPtr); |