diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-28 16:48:09 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-28 16:49:06 +0100 |
| commit | be3fb9afe50361e4b35d02d28ef30851335b17b6 (patch) | |
| tree | 8627b1ab4a5d843b9e27b78e7341553e624ef4fc /qmake | |
| parent | 42507173bd985d8b3875d9fd0141a1dd7ad4e544 (diff) | |
| parent | a65982d659226ace42fe0a0ca0a2f15523e95e4b (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I6b49d5e1c31599b5aa4940b798533b17e58616bf
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 9893a7a7a4..c5b2c56f8f 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -902,12 +902,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" |