diff options
| author | Morten Sorvig <morten.sorvig@nokia.com> | 2011-05-19 09:18:34 +0200 |
|---|---|---|
| committer | Morten Sorvig <morten.sorvig@nokia.com> | 2011-05-19 09:18:46 +0200 |
| commit | e0e696dd05fbe329044879cf560fe26330edf7bd (patch) | |
| tree | 86fa4e35ee3f6b0de12cbc4c098fb9d78c128ab3 /qmake | |
| parent | 2a5cc5fc625350b77d7b82eaa8c43bce0d446cd1 (diff) | |
Remove QMAKE_MACOS_DEPLOYMENT_TARGET.
Not needed any more, 10.5 and up supports setting
the deployment target/minimum version on the
compiler command line.
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 3 | ||||
| -rw-r--r-- | qmake/qmake.pri | 1 |
2 files changed, 0 insertions, 4 deletions
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 { |