diff options
| author | Ian <IanFromAfrica@yahoo.co.uk> | 2011-06-08 10:36:28 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-20 06:06:53 (GMT) |
| commit | 3da1acfeda31604412b5826b9bfeeb73a4ff2779 (patch) | |
| tree | 4ce8642eff28da70ceb0a1e21cfa7fef34d16c22 /qmake | |
| parent | 47e6c8bc62d4264ac149f5f063bb8741dbe25def (diff) | |
| download | Qt-3da1acfeda31604412b5826b9bfeeb73a4ff2779.zip Qt-3da1acfeda31604412b5826b9bfeeb73a4ff2779.tar.gz Qt-3da1acfeda31604412b5826b9bfeeb73a4ff2779.tar.bz2 | |
Export IPHONEOS_DEPLOYMENT_TARGET from qmake
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 4 |
2 files changed, 6 insertions, 0 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/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; |