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 | |
| 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.
| -rw-r--r-- | mkspecs/common/mac.conf | 5 | ||||
| -rw-r--r-- | qmake/qmake.pri | 2 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 2 |
3 files changed, 4 insertions, 5 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) diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 9ba8506..1f9243b 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -107,7 +107,7 @@ bootstrap { #Qt code SOURCES += qfsfileengine_unix.cpp qfsfileengine_iterator_unix.cpp mac { SOURCES += qcore_mac.cpp qsettings_mac.cpp - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 #enables weak linking for 10.3 (exported) + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported) LIBS += -framework ApplicationServices } } else:win32 { diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index d8a1f96..396e9ae 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -89,7 +89,7 @@ win32:SOURCES += ../../corelib/io/qfsfileengine_win.cpp \ ../../corelib/io/qfsfileengine_iterator_win.cpp macx: { - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 #enables weak linking for 10.3 (exported) + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported) SOURCES += ../../corelib/kernel/qcore_mac.cpp LIBS += -framework CoreServices } |