From 1b80c13b3a0e2f3e2469f4550047d0399886c58c Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Mon, 5 May 2014 12:53:24 +0200 Subject: [PATCH] Xcode generator: resolve QMAKE_BUNDLE_RESOURCES from project source MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A pro file that adds files to QMAKE_BUNDLE_DATA using relative paths will fail building if doing shadow builds. The reason is that we look for the files inside the build dir. This change will make sure we resolve files from the source dir when not using full paths. Task-number: QTBUG-37054 Change-Id: Ic1067861097b3b6a640ee862472d728d6188576a Reviewed-by: Tor Arne Vestbø Reviewed-by: Oswald Buddenhagen --- qmake/generators/mac/pbuilder_pbx.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index da64c33cf2..d44c2ca73f 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -1116,7 +1116,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 = files[file].toQString(); + QString fn = fileFixify(files[file].toQString(), Option::output_dir, input_dir); QString file_ref_key = keyFor("QMAKE_PBX_BUNDLE_DATA_FILE_REF." + bundle_data[i] + "-" + fn); bundle_file_refs += file_ref_key; t << "\t\t" << file_ref_key << " = {\n"