diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-24 15:09:38 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-24 15:09:38 +0200 |
| commit | 509ed01c85c926387f6573dd1b5fe6611fa08118 (patch) | |
| tree | cdc2b8a7df4c9778176a1e3341d018971f769daa /qmake/generators/mac | |
| parent | 288e50227dd5af7cdaba7e4b54a61c539021f1e0 (diff) | |
| parent | 084c5b3db794af1ce86b2b17455d9be5e64baebe (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'qmake/generators/mac')
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index b4ae89c0a9..d1c70900fb 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -516,7 +516,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) //HEADER const int pbVersion = pbuilderVersion(); ProStringList buildConfigGroups; - buildConfigGroups << "PROJECTTARGET"; + buildConfigGroups << "PROJECT" << "TARGET"; t << "// !$*UTF8*$!\n" << "{\n" @@ -1099,10 +1099,9 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) if (useCopyResourcesPhase) { if (!project->isEmpty("ICON")) { ProString icon = project->first("ICON"); - if (icon.length() >= 2 && (icon.at(0) == '"' || icon.at(0) == '\'') && icon.endsWith(icon.at(0))) { + if (icon.length() >= 2 && (icon.at(0) == '"' || icon.at(0) == '\'') && icon.endsWith(icon.at(0))) icon = icon.mid(1, icon.length() - 2); - bundle_resources_files += keyFor(icon + ".BUILDABLE"); - } + bundle_resources_files += keyFor(icon + ".BUILDABLE"); } QString grp("Copy Bundle Resources"), key = keyFor(grp); |