|author||Tor Arne Vestbø <firstname.lastname@example.org>||2012-01-23 12:54:38 +0100|
|committer||Qt by Nokia <email@example.com>||2012-01-23 14:47:10 +0100|
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 <firstname.lastname@example.org> Reviewed-by: Bradley T. Hughes <email@example.com>
Diffstat (limited to 'configure')
1 files changed, 0 insertions, 8 deletions
@@ -7319,14 +7319,6 @@ if [ "$CFG_EXCEPTIONS" = "no" ]; then
-# Set the minimum deployment target.
-if [ "$BUILD_ON_MAC" = "yes" ]; then
- QMakeVar add QMAKE_CFLAGS "-mmacosx-version-min=10.6"
- QMakeVar add QMAKE_CXXFLAGS "-mmacosx-version-min=10.6"
- QMakeVar add QMAKE_LFLAGS "-mmacosx-version-min=10.6"
- QMakeVar add QMAKE_OBJECTIVE_CFLAGS "-mmacosx-version-min=10.6"
case "$COMPILER" in
# GNU C++