diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2012-12-09 19:03:35 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-08 20:16:51 (GMT) |
| commit | acfd489fb344d53463525c7b390cce7381f67b80 (patch) | |
| tree | 7989a3431689e07b53fdde8109fd4cdea407607c | |
| parent | e660fb368dca169fa3d487d1979f30518bad6e7d (diff) | |
| download | Qt-acfd489fb344d53463525c7b390cce7381f67b80.zip Qt-acfd489fb344d53463525c7b390cce7381f67b80.tar.gz Qt-acfd489fb344d53463525c7b390cce7381f67b80.tar.bz2 | |
Respect the OBJECTS_DIR setting for XCode projects
Task-number: QTBUG-28104
Change-Id: I0361cb979c40ce14ac163453d8229efc69527b6c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/eb2d0c82eb8842713f897c0de8c960d07e62df7d)
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index e565628..ccf9545 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -1328,10 +1328,6 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) 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"; - } #if 0 if(!project->isEmpty("DESTDIR")) t << "\t\t\t\t" << writeSettings("SYMROOT", fixForOutput(project->first("DESTDIR"))) << ";" << "\n"; @@ -1586,6 +1582,8 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) if (!archs.isEmpty()) t << "\t\t\t\t" << writeSettings("ARCHS", archs) << ";" << "\n"; } + if (!project->isEmpty("OBJECTS_DIR")) + t << "\t\t\t\t" << writeSettings("OBJROOT", escapeFilePath(project->first("OBJECTS_DIR"))) << ";" << "\n"; } else { if (project->first("TEMPLATE") == "app") { if (pbVersion < 38 && project->isActiveConfig("app_bundle")) |