diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-27 23:57:04 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-27 23:57:06 +0100 |
| commit | 70d5cb406fda70d175faac5f9588f0e345588c56 (patch) | |
| tree | 1b7e95bdf142da42a5d9fea6068a46c78055eddd /mkspecs/features/configure.prf | |
| parent | 3b5600f6ee9f2982c5a93250e577f87a34fe32d1 (diff) | |
| parent | 9b05f675e311d1962f0670193cf4df75a07f4999 (diff) | |
Merge branch 'ios' into dev
Change-Id: I5d18d502908920a44bbc506aba77dd805d94d843
Diffstat (limited to 'mkspecs/features/configure.prf')
| -rw-r--r-- | mkspecs/features/configure.prf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index 39144e7216..b4569df6d5 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -7,6 +7,9 @@ equals(MAKEFILE_GENERATOR, UNIX) { QMAKE_MAKE = mingw32-make } else:if(equals(MAKEFILE_GENERATOR, MSVC.NET)|equals(MAKEFILE_GENERATOR, MSBUILD)) { QMAKE_MAKE = nmake +} else:ios { + # iOS unsets MAKEFILE_GENERATOR in its default_pre.prf + QMAKE_MAKE = make } else { error("Configure tests are not supported with the $$MAKEFILE_GENERATOR Makefile generator.") } |