diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-04-11 17:06:01 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-04-14 09:01:46 +0200 |
| commit | 1fb187f51393ccaa4b08e04048592a6a6a99025d (patch) | |
| tree | 67123bac50fb4a0279ecc30c888a00158640d54e | |
| parent | d9548d6422d620ab1cd55ef0a58ea628f6be87a5 (diff) | |
| download | qt-creator-1fb187f51393ccaa4b08e04048592a6a6a99025d.tar.gz | |
fix use of $$split()
it takes a variable, not a value.
the spec_pre.prf part is cherry-picked from qtbase/89a558d6b0fac.
Change-Id: Ie7e551cf0b889d7682f032124dd0466ada6972e4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| -rw-r--r-- | src/plugins/clangcodemodel/clang_installation.pri | 4 | ||||
| -rw-r--r-- | src/shared/proparser/spec_pre.prf | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/clangcodemodel/clang_installation.pri b/src/plugins/clangcodemodel/clang_installation.pri index 074b4d0eea..807f36b3bf 100644 --- a/src/plugins/clangcodemodel/clang_installation.pri +++ b/src/plugins/clangcodemodel/clang_installation.pri @@ -23,9 +23,9 @@ defineReplace(findLLVMConfig) { # Find llvm-config* in PATH ENV_PATH = $$(PATH) win32 { - ENV_PATH = $$split($$ENV_PATH, ;) + ENV_PATH = $$split(ENV_PATH, ;) } else { - ENV_PATH = $$split($$ENV_PATH, :) + ENV_PATH = $$split(ENV_PATH, :) } for (variant, LLVM_CONFIG_VARIANTS) { for (path, ENV_PATH) { diff --git a/src/shared/proparser/spec_pre.prf b/src/shared/proparser/spec_pre.prf index bcd4a08449..34dab535ba 100644 --- a/src/shared/proparser/spec_pre.prf +++ b/src/shared/proparser/spec_pre.prf @@ -23,7 +23,8 @@ equals(QMAKE_HOST.os, Windows) { QMAKE_EXT_OBJ = .obj QMAKE_EXT_RES = .res QMAKE_SH = - PATH = $$split($$(PATH), ;) + PATH = $$(PATH) + PATH = $$split(PATH, ;) for(dir, PATH) { exists($$dir/sh.exe) { QMAKE_SH = $$dir/sh.exe |