diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-04-29 20:15:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-30 16:56:54 +0200 |
| commit | e5024c219fffa972e087a684bacef240082dca82 (patch) | |
| tree | a556780af0f6dd5827fa50d90c85eb0bdab1c5ad /mkspecs/features/incredibuild_xge.prf | |
| parent | 5c05534a63f3ce97530b3827533ba9a0f4e2d57c (diff) | |
untangle use of system vs. shell path(-list) semantics
"system" refers to the system's native shell, which is what qmake's
system() invokes, and whose convention by far most commands invoked from
a makefile will need.
"shell" refers to the shell invoked by make, which diverges from the
system shell only when qmake/mingw32-make is called from an msys shell.
its conventions need to be used for anything the shell itself does
(e.g., assembling env variables, but also command line argument
unquoting) and the commands the mkspec sets according to the shell
(e.g., QMAKE_MOVE).
Change-Id: I0000aa9417c199cf8a810619d31ded24bb0675f9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'mkspecs/features/incredibuild_xge.prf')
| -rw-r--r-- | mkspecs/features/incredibuild_xge.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/incredibuild_xge.prf b/mkspecs/features/incredibuild_xge.prf index b43ecf2809..75c7a9a75b 100644 --- a/mkspecs/features/incredibuild_xge.prf +++ b/mkspecs/features/incredibuild_xge.prf @@ -3,6 +3,6 @@ contains(TEMPLATE, "vc.*") { EOC = $$escape_expand(\\r\\h) for(xge, INCREDIBUILD_XGE) { - $${xge}.commands = Rem IncrediBuild_AllowRemote $$EOC Rem IncrediBuild_OutputFile $$shell_path($${xge}.output) $$EOC $$eval($${xge}.commands) + $${xge}.commands = Rem IncrediBuild_AllowRemote $$EOC Rem IncrediBuild_OutputFile $$system_path($${xge}.output) $$EOC $$eval($${xge}.commands) } } |