diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2014-11-20 10:38:37 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-04 16:34:02 +0000 |
| commit | cf38b12a27627161e6799a3883285d05bc6420e5 (patch) | |
| tree | 07305955621546cf9bb961a0d31250eb2ddcfc83 /tests | |
| parent | fde33949f4992034626980aaaa237f05128fc310 (diff) | |
make shellQuoteWin() be more sparing with circumflexes
... as newer versions of nmake (and jom, for compatibility) have botched
circumflex processing (they simply don't do it when shortcutting the shell
evaluation).
as a side effect, the output is also more readable if the string contains
quotes.
Change-Id: I0506b59ceecb70da258c482f9973156b2803066d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/tools/qmake/testdata/functions/functions.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/tools/qmake/testdata/functions/functions.pro b/tests/auto/tools/qmake/testdata/functions/functions.pro index a0e88300d4..5db8036188 100644 --- a/tests/auto/tools/qmake/testdata/functions/functions.pro +++ b/tests/auto/tools/qmake/testdata/functions/functions.pro @@ -156,9 +156,9 @@ testReplace($$relative_path("/fake/trolls", "/fake/path"), "../trolls", "relativ testReplace($$relative_path(""), "", "relative_path of empty") #this test is very rudimentary. the backend function is thoroughly tested in qt creator -in = "some nasty\" path\\" -out_cmd = "\"some nasty\"\\^\"\" path\"\\" -out_sh = "'some nasty\" path\\'" +in = "some nasty & ugly\" path & thing\\" +out_cmd = "\"some nasty & ugly\\\" path ^& thing\\\\^\"" +out_sh = "'some nasty & ugly\" path & thing\\'" equals(QMAKE_HOST.os, Windows): \ out = $$out_cmd else: \ |