diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 11:49:43 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 11:49:47 +0100 |
commit | 63f24f6ba8417e90294a1a90d01a3c3de80b7af4 (patch) | |
tree | 27b5788a3e7c1e94b484e642142b1be8ff8da318 /mkspecs | |
parent | ae2359d49e171c61450b17b1eb0e0dd7a20c7ca4 (diff) | |
parent | 05659223bf02c8bac0463fe1e7a9364ef5677b75 (diff) |
Merge branch 'stable' into dev
Change-Id: I7f0dab6bdb1f3cc1d3e6c30166ff6db9dfae37e9
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/configure.prf | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index ff52c6b373..39144e7216 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -1,11 +1,15 @@ -equals(MAKEFILE_GENERATOR, UNIX): \ +equals(MAKEFILE_GENERATOR, UNIX) { QMAKE_MAKE = make -else:equals(MAKEFILE_GENERATOR, MINGW): \ - QMAKE_MAKE = mingw32-make -else:if(equals(MAKEFILE_GENERATOR, MSVC.NET)|equals(MAKEFILE_GENERATOR, MSBUILD)): \ +} else:equals(MAKEFILE_GENERATOR, MINGW) { + !equals(QMAKE_HOST.os, Windows): \ + QMAKE_MAKE = make + else: \ + QMAKE_MAKE = mingw32-make +} else:if(equals(MAKEFILE_GENERATOR, MSVC.NET)|equals(MAKEFILE_GENERATOR, MSBUILD)) { QMAKE_MAKE = nmake -else: \ +} else { error("Configure tests are not supported with the $$MAKEFILE_GENERATOR Makefile generator.") +} # Ensure that a cache is present. If none was found on startup, this will create # one in the build directory of the project which loads this feature. |