diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-10-28 18:21:29 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-10-28 18:21:45 +0100 |
| commit | 8613b64f535b0ce05adf6f4708ba0826f22a7eb4 (patch) | |
| tree | 101d18856ef81169df0da8a0e7afb846e5579a62 /mkspecs | |
| parent | d6c1a9cb267cc5ffec2e55bc9990ced43c19b73a (diff) | |
| parent | a3cb057c3d5c9ed2c12fb7542065c3d667be38b7 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I224e44a9df314b9a99d33148b6cf400fcbc9de8e
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/configure.prf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index 05e10c9641..6b37a04450 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -1,4 +1,7 @@ -equals(MAKEFILE_GENERATOR, UNIX) { +QMAKE_MAKE = $$(MAKE) +!isEmpty(QMAKE_MAKE) { + # We were called recursively. Use the right make, as MAKEFLAGS may be set as well. +} else:equals(MAKEFILE_GENERATOR, UNIX) { QMAKE_MAKE = make } else:equals(MAKEFILE_GENERATOR, MINGW) { !equals(QMAKE_HOST.os, Windows): \ |