From ac0f6d1a349748ff82e1710c33e91e6b3f179a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Tue, 18 Dec 2012 09:28:07 +0100 Subject: iOS: Fix build for modules that load(configure) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit configure.prf checks if MAKEFILE_GENERATOR is set to something it can work with. ios/default_pre.prf unsets MAKEFILE_GENERATOR. This breaks QtMultimedia at least. Add special case for iOS to configure.prf and set QMAKE_MAKE to "make". Change-Id: Ie8feaeefe4a932d735a0cd4c09e869ca1341aae5 Reviewed-by: Richard Moe Gustavsen Reviewed-by: Tor Arne Vestbø --- mkspecs/features/configure.prf | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mkspecs/features/configure.prf') 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.") } -- cgit v1.2.3