From 1a71fe0306d8d8984d62d83e2cd616b9bac7e2fe Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 12 Apr 2018 15:20:15 +0200 Subject: 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 --- qmake/generators/unix/unixmake2.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'qmake') diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 8ecfa0bf31..5468285c2e 100644 --- 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; -- cgit v1.2.3