diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2013-10-02 14:58:35 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@digia.com> | 2014-10-27 21:00:14 +0100 |
| commit | 09d62813fcb42660888284168540e74a187913aa (patch) | |
| tree | fa81a57ff54fc1de81d9f693faa8686f7ab15e8b /qmake | |
| parent | d75e9ba08ae0e2c71812c0e5b157a2f93c8eedfd (diff) | |
| download | qt4-tools-09d62813fcb42660888284168540e74a187913aa.tar.gz | |
Handle relative paths correctly for files in QMAKE_BUNDLE_DATA
Partially cherry pick from f6bd02317db7beadda1237df7feddd4a780415cb
from Qt 5. The Qt 5 SHA1 changes a lot of different parts in the
XCode generator after a general qmake change caused some problems.
So we just pick the part needed to fix the handling of relative
paths used in files in QMAKE_BUNDLE_DATA.
Change-Id: I364f82a353dfa922591d07c2aa9061666b79de02
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 13b25c67d8..98f17191e5 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -1060,6 +1060,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) << "\t\t\t" << writeSettings("isa", "PBXFileReference", SettingsNoQuote) << ";" << "\n" << "\t\t\t" << writeSettings("path", escapeFilePath(files[file])) << ";" << "\n" << "\t\t\t" << writeSettings("refType", QString::number(reftypeForFile(files[file])), SettingsNoQuote) << ";" << "\n" + << "\t\t\t" << writeSettings("sourceTree", sourceTreeForFile(files[file])) << ";\n" << "\t\t" << "};" << "\n"; QString copy_file_key = keyFor("QMAKE_PBX_BUNDLE_COPY_FILE." + bundle_data[i] + "-" + files[file]); pbx_files += copy_file_key; |