summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@digia.com>2013-02-26 08:59:24 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-01 14:50:28 (GMT)
commit978e523a296db97c08d7cd9fc81c491a99e830da (patch)
treebba88ed5dec5a5e53dfba335a639fec65034ebfe /qmake
parent1fb11ed3532a0e47c8a4539600973e880b4cb78f (diff)
downloadQt-978e523a296db97c08d7cd9fc81c491a99e830da.zip
Qt-978e523a296db97c08d7cd9fc81c491a99e830da.tar.gz
Qt-978e523a296db97c08d7cd9fc81c491a99e830da.tar.bz2
Fix generation of XCode projects for XCode 4.6
When a framework is referenced in the XCode project then it is known as a framework by the lastKnownFileType and not the reference type. This ensures it works in both XCode 3 and XCode 4. Task-number: QTBUG-29371 Change-Id: I434246a46d6c5bfd50ba7de1a7c710c0caf0bc0a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> (cherry picked from qtbase/4a6a066df2f104763c35eaaaf8dc7b1366d483b2)
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/mac/pbuilder_pbx.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index 4e593ea..22ae768 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -920,12 +920,14 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
QString key = keyFor(library);
bool is_frmwrk = (library.endsWith(".framework"));
t << "\t\t" << key << " = {" << "\n"
- << "\t\t\t" << writeSettings("isa", (is_frmwrk ? "PBXFrameworkReference" : "PBXFileReference"), SettingsNoQuote) << ";" << "\n"
+ << "\t\t\t" << writeSettings("isa", "PBXFileReference", SettingsNoQuote) << ";" << "\n"
<< "\t\t\t" << writeSettings("name", escapeFilePath(name)) << ";" << "\n"
<< "\t\t\t" << writeSettings("path", escapeFilePath(library)) << ";" << "\n"
<< "\t\t\t" << writeSettings("refType", QString::number(reftypeForFile(library)), SettingsNoQuote) << ";" << "\n"
- << "\t\t\t" << writeSettings("sourceTree", sourceTreeForFile(library)) << ";" << "\n"
- << "\t\t" << "};" << "\n";
+ << "\t\t\t" << writeSettings("sourceTree", sourceTreeForFile(library)) << ";" << "\n";
+ if (is_frmwrk)
+ t << "\t\t\t" << writeSettings("lastKnownFileType", "wrapper.framework") << ";" << "\n";
+ t << "\t\t" << "};" << "\n";
project->values("QMAKE_PBX_LIBRARIES").append(key);
QString build_key = keyFor(library + ".BUILDABLE");
t << "\t\t" << build_key << " = {" << "\n"