From 9ce5a0671a50fd04677506b869801d4ce5345acb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 23 Jan 2012 12:54:38 +0100 Subject: Set macosx-version-min in common Mac OS X mkspec instead of configure When set in configure it would be written to .qmake.cache and would only apply when building Qt. We then had an override (that was also out of sync, version-wise) in the g++ mkspec, which would also apply to apps building agains Qt. This override did howerver not apply when using the Clang mkspec. We now move setting macosx-version-min to the common macx mkspec, shared by both g++ and Clang, which will apply both when building Qt and when building something against Qt. The latter since an application built against Qt will not deploy on versions of Mac OS earlier than 10.6 anyways, so we might as well always set the minimum-version. The modifications to the mkspecs will result in macosx-version-min being passed twice when compiling qmake, as configure writes its own makefiles and the mkspec parsing in configure has a bug where it will lazily evaluate qmake-variables instead of evaluating them inline. This is not a problem, and can be fixed in a later patch if seen fit. Change-Id: Ib29503ad00a9dc00e0a50b0dbd9459e89a20dfbd Reviewed-by: Zeno Albisser Reviewed-by: Bradley T. Hughes --- mkspecs/common/g++-macx.conf | 3 --- 1 file changed, 3 deletions(-) (limited to 'mkspecs/common/g++-macx.conf') diff --git a/mkspecs/common/g++-macx.conf b/mkspecs/common/g++-macx.conf index 22511573c1..acce2fe14e 100644 --- a/mkspecs/common/g++-macx.conf +++ b/mkspecs/common/g++-macx.conf @@ -16,9 +16,6 @@ QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += -g $$QMAKE_CFLAGS_DWARF2 QMAKE_LFLAGS_STATIC_LIB += -all_load -QMAKE_CFLAGS_X86_64 += -Xarch_x86_64 -mmacosx-version-min=10.5 -QMAKE_CFLAGS_PPC_64 += -Xarch_ppc64 -mmacosx-version-min=10.5 - QMAKE_CXXFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64 QMAKE_CXXFLAGS_PPC_64 = $$QMAKE_CFLAGS_PPC_64 QMAKE_OBJECTIVE_CFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64 -- cgit v1.2.3