diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-06-24 09:12:15 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-06-24 09:12:15 (GMT) |
| commit | 11cc0f661911628fb51c92d30c684eb1cea01145 (patch) | |
| tree | 3f89e82669b12ea49e0586d3ff14c0d01594301e /qmake | |
| parent | 9d5b0e31f287ce502eaf9a2c0876d900424c80ab (diff) | |
| parent | 164728f711136356a6c3482f762321b01c9d82dd (diff) | |
| download | Qt-11cc0f661911628fb51c92d30c684eb1cea01145.zip Qt-11cc0f661911628fb51c92d30c684eb1cea01145.tar.gz Qt-11cc0f661911628fb51c92d30c684eb1cea01145.tar.bz2 | |
Merge remote-tracking branch 'origin/4.8'
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/symbian/symbiancommon.h | 1 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 4 | ||||
| -rw-r--r-- | qmake/qmake.pri | 2 |
4 files changed, 8 insertions, 1 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index b7aec00..9a87eb6 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -1324,6 +1324,8 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) t << "\t\t\t\t" << writeSettings("DYLIB_COMPATIBILITY_VERSION", project->first("COMPAT_VERSION")) << ";" << "\n"; if(!project->isEmpty("QMAKE_MACOSX_DEPLOYMENT_TARGET")) t << "\t\t\t\t" << writeSettings("MACOSX_DEPLOYMENT_TARGET", project->first("QMAKE_MACOSX_DEPLOYMENT_TARGET")) << ";" << "\n"; + if(!project->isEmpty("QMAKE_IPHONEOS_DEPLOYMENT_TARGET")) + t << "\t\t\t\t" << writeSettings("IPHONEOS_DEPLOYMENT_TARGET", project->first("QMAKE_IPHONEOS_DEPLOYMENT_TARGET")) << ";" << "\n"; if(pbVersion >= 38) { if(!project->isEmpty("OBJECTS_DIR")) t << "\t\t\t\t" << writeSettings("OBJROOT", fixForOutput(project->first("OBJECTS_DIR"))) << ";" << "\n"; diff --git a/qmake/generators/symbian/symbiancommon.h b/qmake/generators/symbian/symbiancommon.h index 69d2a21..8402e13 100644 --- a/qmake/generators/symbian/symbiancommon.h +++ b/qmake/generators/symbian/symbiancommon.h @@ -119,6 +119,7 @@ protected: const SymbianLocalizationList &symbianLocalizationList); QString generateLocFileName(); + protected: MakefileGenerator *generator; diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 30d7822..fc951b1 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -179,6 +179,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) t << "export MACOSX_DEPLOYMENT_TARGET = " //exported to children processes << project->first("QMAKE_MACOSX_DEPLOYMENT_TARGET") << endl; + if(!project->isEmpty("QMAKE_IPHONEOS_DEPLOYMENT_TARGET")) + t << "export IPHONEOS_DEPLOYMENT_TARGET = " //exported to children processes + << project->first("QMAKE_IPHONEOS_DEPLOYMENT_TARGET") << endl; + if (!project->isEmpty("QMAKE_SYMBIAN_SHLIB")) { t << "vpath %.dso " << project->values("QMAKE_LIBDIR").join(":") << endl; t << "vpath %.lib " << project->values("QMAKE_LIBDIR").join(":") << endl; diff --git a/qmake/qmake.pri b/qmake/qmake.pri index d6c5f09..87735d6 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -146,7 +146,7 @@ bootstrap { #Qt code qnx { CFLAGS += -fhonor-std - LFLAGS += -lcpp + LFLAGS += -lcpp -lm } DEFINES *= QT_NO_QOBJECT } else { |