qmake: fix QMAKE_BUNDLE_DATA for (some) generated files

the source file must not be written with an absolute path to the makefile, as this won't match the name of the target which generates it, thus leading to an unsatisfied dependency. this is the proper fix for QTBUG-60413 and a bunch of others. amends historical f173e217cd. Change-Id: I28140351c4b4759de35e60daf63bc54b82d104ec Reviewed-by: Alexandru Croitor <[email protected]>
zhangzhuo520 · Apr 12, 2018 · 1a71fe0 · 1a71fe0
1 parent 9917eb2
commit 1a71fe0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
@@ -943,7 +943,9 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                     QString fn = files.at(file).toQString();
                     QString src = fileFixify(fn, FileFixifyAbsolute);
                     if (!QFile::exists(src))
-                        src = fn;
+                        src = fileFixify(fn, FileFixifyFromOutdir);
+                    else
+                        src = fileFixify(fn);
                     QString dst = path + Option::dir_sep + fileInfo(fn).fileName();
                     bundledFiles << dst;
                     alldeps << dst;