diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-21 11:11:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-21 11:11:07 (GMT) |
| commit | ae23dff04aefa4f3aabb841278ce24de2318c390 (patch) | |
| tree | 3be373c346511086609089f8917690bbbe8fa805 /qmake/generators | |
| parent | d5631f115c2e32f8201e98813613010c9d7cb590 (diff) | |
| parent | 6122f0746cac1008d967c19a8b609d7c92fbc8a5 (diff) | |
| download | Qt-ae23dff04aefa4f3aabb841278ce24de2318c390.zip Qt-ae23dff04aefa4f3aabb841278ce24de2318c390.tar.gz Qt-ae23dff04aefa4f3aabb841278ce24de2318c390.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Adding debug output for not supported gl features
Compile fix in network for ios
Make it possible to compile in a screen plugin name in QWS
Don't redefine EGL defines
Compile fixes in corelib for ios
Export IPHONEOS_DEPLOYMENT_TARGET from qmake
Adding arm armv6 and armv7 as valid archs for mac builds
reset certain global variables on deletion
Made tst_QWidget::repaintWhenChildDeleted() pass.
Diffstat (limited to 'qmake/generators')
| -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; |