summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTor Arne Vestbø <torarnv@gmail.com>2013-02-16 15:03:33 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-18 00:32:18 +0100
commit193e3ba32e0c808b48216d9d96aa88e591dd189f (patch)
treea0b0f467f7a9569b617b6da364f0f0983cc1eb99 /src
parent0768920dbdabef25eb7d41e8dbba891704b24f09 (diff)
Don't override OS X deployment target unconditionally in qsystemdetection.h
AvailabilityMacros.h will pick up the MACOSX_DEPLOYMENT_TARGET environment variable, as well as the -mmacosx-min-version= command line flag, and set the MAC_OS_X_VERSION_MIN_REQUIRED based on that. By setting the define before including AvailabilityMacros.h we essentially skipped that whole logic and always set it to 10.6. Only in the case where there's no deployment target specified on the command line do we want to ensure that it's at least 10.6 Change-Id: Ic558ff4deb77937ea805b048d83949815b273bcc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/global/qsystemdetection.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h
index b7c586a3e2..f8a61962ec 100644
--- a/src/corelib/global/qsystemdetection.h
+++ b/src/corelib/global/qsystemdetection.h
@@ -175,11 +175,12 @@
#endif
#ifdef Q_OS_DARWIN
-# ifdef MAC_OS_X_VERSION_MIN_REQUIRED
-# undef MAC_OS_X_VERSION_MIN_REQUIRED
-# endif
-# define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_6
# include <AvailabilityMacros.h>
+# if !defined(MAC_OS_X_VERSION_MIN_REQUIRED) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
+# undef MAC_OS_X_VERSION_MIN_REQUIRED
+# define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_6
+# endif
+#
# if !defined(MAC_OS_X_VERSION_10_3)
# define MAC_OS_X_VERSION_10_3 MAC_OS_X_VERSION_10_2 + 1
# endif