diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-15 17:27:51 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-22 19:23:26 +0100 |
commit | 736e4258a10c1df8dd5e4a5170fbc1a7d6e5588f (patch) | |
tree | 97078bbb93ba062a770b3a5ad6767a6758b99ea5 /mkspecs/macx-g++-32 | |
parent | cb8bfeafac537fd8b985eded4b4a0b2adba28b7e (diff) | |
download | qtbase-736e4258a10c1df8dd5e4a5170fbc1a7d6e5588f.tar.gz |
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 <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs/macx-g++-32')
-rw-r--r-- | mkspecs/macx-g++-32/qmake.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/macx-g++-32/qmake.conf b/mkspecs/macx-g++-32/qmake.conf index 845c3874dc..d60c0dc411 100644 --- a/mkspecs/macx-g++-32/qmake.conf +++ b/mkspecs/macx-g++-32/qmake.conf @@ -13,7 +13,8 @@ QMAKE_INCREMENTAL_STYLE = sublib include(../common/mac.conf) include(../common/gcc-base-macx.conf) include(../common/g++-macx.conf) -include(../common/mac-minimum-version.conf) + +QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 QMAKE_CFLAGS += -arch i386 QMAKE_OBJECTIVE_CFLAGS += -arch i386 |