diff options
| author | Jonathan Liu <net147@gmail.com> | 2013-04-15 14:02:13 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-16 12:38:10 +0200 |
| commit | e6f5f9638bf32baf3312e5c2e06f817bbcfc8ca1 (patch) | |
| tree | 137beb90b3dcd0ca1092ccc97bbd35685f941478 /Tools | |
| parent | 81660d9b909428fe676bf4e9ea03bedc7bc74796 (diff) | |
| download | qtwebkit-e6f5f9638bf32baf3312e5c2e06f817bbcfc8ca1.tar.gz | |
Improve Windows cmd.exe detection
https://bugs.webkit.org/show_bug.cgi?id=114620
Reviewed by Jocelyn Turcotte.
The current detection code handles Windows cmd.exe and Cygwin shell
but not does not handle MSYS shell correctly. Simplify and improve the
detection by checking MINGW_IN_SHELL instead as used in other places
(e.g. qt_functions.prf).
* qmake/mkspecs/features/default_pre.prf:
Change-Id: Iece8597e344b9f5c0166bcc74e7ac4dc424bb1b4
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@148435 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/qmake/mkspecs/features/default_pre.prf | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf index 75acbc3a4..0d3ba511b 100644 --- a/Tools/qmake/mkspecs/features/default_pre.prf +++ b/Tools/qmake/mkspecs/features/default_pre.prf @@ -37,11 +37,7 @@ equals(OUT_PWD, $${ROOT_BUILD_DIR}) { } # Try to detect if we're running under Windows cmd.exe or not -win32* { - pwd = $$(PWD) # Normally empty for cmd.exe - pwd_starts_with_slash = $$find(pwd, ^/) - isEmpty(pwd_starts_with_slash): CONFIG += win_cmd_shell -} +win32:isEmpty(MINGW_IN_SHELL): CONFIG += win_cmd_shell # Default location of generated sources GENERATED_SOURCES_DESTDIR = generated |