From 736e4258a10c1df8dd5e4a5170fbc1a7d6e5588f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 15 Feb 2013 17:27:51 +0100 Subject: Use sdk.prf to set macosx-version-min instead of static conf files Allows us to dynamically generate the command line option for iOS later, and allows the user to override QMAKE_MACOSX_DEPLOYMENT_TARGET with the expected effect on the command line options. We unset PERL5LIB to ensure we get the system Perl libraries, since the Mac OS 10.6 CI machine seems to have a broken XML::Parser::Expat from macports/CPAN. Change-Id: I04430c7b1daf9452d72f9a04a6b7f8d0d6926884 Reviewed-by: Oswald Buddenhagen --- mkspecs/macx-clang-32/qmake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mkspecs/macx-clang-32/qmake.conf') diff --git a/mkspecs/macx-clang-32/qmake.conf b/mkspecs/macx-clang-32/qmake.conf index b6cceaff91..01b4b419c7 100644 --- a/mkspecs/macx-clang-32/qmake.conf +++ b/mkspecs/macx-clang-32/qmake.conf @@ -10,7 +10,8 @@ include(../common/mac.conf) include(../common/gcc-base-macx.conf) include(../common/clang.conf) include(../common/clang-mac.conf) -include(../common/mac-minimum-version.conf) + +QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 QMAKE_CFLAGS += -arch i386 QMAKE_OBJECTIVE_CFLAGS += -arch i386 -- cgit v1.2.3