From acfd489fb344d53463525c7b390cce7381f67b80 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Sun, 9 Dec 2012 20:03:35 +0100 Subject: Respect the OBJECTS_DIR setting for XCode projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-28104 Change-Id: I0361cb979c40ce14ac163453d8229efc69527b6c Reviewed-by: Oswald Buddenhagen Reviewed-by: Tor Arne Vestbø Reviewed-by: Joerg Bornemann (cherry picked from qtbase/eb2d0c82eb8842713f897c0de8c960d07e62df7d) --- qmake/generators/mac/pbuilder_pbx.cpp | 6 ++---- 1 file 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")) -- cgit v0.12