diff options
| author | Morten Sorvig <msorvig@trolltech.com> | 2009-08-06 06:16:50 (GMT) |
|---|---|---|
| committer | Morten Sorvig <msorvig@trolltech.com> | 2009-08-06 06:16:50 (GMT) |
| commit | 4dcc603919779bda9f5dc052c459d914bdc4949b (patch) | |
| tree | a6b965aa4913324f49d5292f3f2a301c250c7af8 /mkspecs/common | |
| parent | 06d57fc65c47d12047e985202ae1e394c48f78ca (diff) | |
| download | Qt-4dcc603919779bda9f5dc052c459d914bdc4949b.zip Qt-4dcc603919779bda9f5dc052c459d914bdc4949b.tar.gz Qt-4dcc603919779bda9f5dc052c459d914bdc4949b.tar.bz2 | |
Replace instances of weak linking for 10.3 with 10.4.
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/mac.conf | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index 818b450..5d88ac4 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) |