diff options
| -rwxr-xr-x | configure | 17 | ||||
| -rw-r--r-- | mkspecs/common/mac.conf | 1 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 3 | ||||
| -rw-r--r-- | qmake/qmake.pri | 1 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 1 |
5 files changed, 1 insertions, 22 deletions
@@ -6967,19 +6967,6 @@ fi [ "$XPLATFORM_MINGW" = "yes" ] && CFG_MAC_COCOA="no" [ "$XPLATFORM_SYMBIAN" = "yes" ] && CFG_MAC_COCOA="no" -# set the global Mac deployment target. This is overridden on an arch-by-arch basis -# in some cases, see code further down -case "$PLATFORM,$CFG_MAC_COCOA" in - macx*,yes) - # Cocoa - QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.5 - ;; - macx*,no) - # gcc, Carbon - QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.4 - ;; -esac - # disable Qt 3 support on VxWorks and Symbian case "$XPLATFORM" in unsupported/vxworks*|symbian*) @@ -7716,9 +7703,7 @@ if [ "$CFG_EXCEPTIONS" = "no" ]; then fi # On Mac, set the minimum deployment target for the different architechtures -# using the Xarch compiler option when supported (10.5 and up). On 10.4 the -# deployment version is set to 10.4 globally using the QMAKE_MACOSX_DEPLOYMENT_TARGET -# env. variable. +# using the Xarch compiler option when supported (10.5 and up). if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=10.4" diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index 96cd2399b3..b22b852013 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -38,7 +38,6 @@ QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir QMAKE_CHK_DIR_EXISTS = test -d QMAKE_MKDIR = mkdir -p -QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 # overridden to 10.5 for Cocoa on the compiler command line include(unix.conf) diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 82f2366349..60e671f2e4 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -175,9 +175,6 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) t << "MOVE = " << var("QMAKE_MOVE") << endl; t << "CHK_DIR_EXISTS= " << var("QMAKE_CHK_DIR_EXISTS") << endl; t << "MKDIR = " << var("QMAKE_MKDIR") << endl; - if(!project->isEmpty("QMAKE_MACOSX_DEPLOYMENT_TARGET")) - t << "export MACOSX_DEPLOYMENT_TARGET = " //exported to children processes - << project->first("QMAKE_MACOSX_DEPLOYMENT_TARGET") << endl; if (!project->isEmpty("QMAKE_SYMBIAN_SHLIB")) { t << "vpath %.dso " << project->values("QMAKE_LIBDIR").join(":") << endl; diff --git a/qmake/qmake.pri b/qmake/qmake.pri index d6c5f09107..548ac546b9 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -134,7 +134,6 @@ bootstrap { #Qt code mac { SOURCES += qfilesystemengine_mac.cpp SOURCES += qcore_mac.cpp qsettings_mac.cpp - 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 6ff948c8e8..11d35b7509 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -108,7 +108,6 @@ else:unix:SOURCES += ../../corelib/tools/qlocale_unix.cpp else:win32:SOURCES += ../../corelib/tools/qlocale_win.cpp macx: { - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported) SOURCES += ../../corelib/io/qfilesystemengine_mac.cpp SOURCES += ../../corelib/kernel/qcore_mac.cpp LIBS += -framework CoreServices |