diff options
| author | Fawzi Mohamed <fawzi.mohamed@theqtcompany.com> | 2015-02-09 18:48:11 +0100 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@theqtcompany.com> | 2015-02-17 17:28:57 +0000 |
| commit | 6ccf0a326ef415b7c9c8d80e9ede0da85e2fb52b (patch) | |
| tree | a2e96b181899153c8b437f8aeb066d25b26a1f18 /qmake | |
| parent | f727ffa1eb6ffe18a485fd91d1d702c5c1558c4f (diff) | |
Use relative path for QMAKE_BUNDLE_DATA
Use of FileFixifyAbsolute with non-default in_dir and out_dir
is not defined (and produces bogus results).
Using FileFixifyRelative when handling QMAKE_BUNDLE_DATA as a relative
path is fine.
Change-Id: I49902dc9f5b8029d092a4419c0cff5483e419c30
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 6af51d845d..24b9091a03 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -1107,7 +1107,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) //all files const ProStringList &files = project->values(ProKey(bundle_data[i] + ".files")); for(int file = 0; file < files.count(); file++) { - QString fn = fileFixify(files[file].toQString(), Option::output_dir, input_dir, FileFixifyAbsolute); + QString fn = fileFixify(files[file].toQString(), Option::output_dir, input_dir, FileFixifyRelative); QString name = fn.split(Option::dir_sep).back(); QString file_ref_key = keyFor("QMAKE_PBX_BUNDLE_DATA_FILE_REF." + bundle_data[i] + "-" + fn); bundle_file_refs += file_ref_key; |