summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorMorten Sorvig <msorvig@trolltech.com>2009-08-06 08:16:50 +0200
committerMorten Sorvig <msorvig@trolltech.com>2009-08-06 08:16:50 +0200
commit4dcc603919779bda9f5dc052c459d914bdc4949b (patch)
treea6b965aa4913324f49d5292f3f2a301c250c7af8 /mkspecs
parent06d57fc65c47d12047e985202ae1e394c48f78ca (diff)
Replace instances of weak linking for 10.3 with 10.4.
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/common/mac.conf5
1 files changed, 2 insertions, 3 deletions
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
index 818b4504d..5d88ac4b6 100644
--- a/mkspecs/common/mac.conf
+++ b/mkspecs/common/mac.conf
@@ -38,8 +38,7 @@ QMAKE_DEL_FILE = rm -f
QMAKE_DEL_DIR = rmdir
QMAKE_CHK_DIR_EXISTS = test -d
QMAKE_MKDIR = mkdir -p
-# Need to enable the correct deployment target for Cocoa (should be 10.3 for Carbon).
-macx-icc: QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
-else: QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3
+QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 # overridden to 10.5 for Cocoa on the compiler command line
+
include(unix.conf)