diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-04-12 21:59:27 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-04-12 22:00:35 +0200 |
| commit | 4f158ccee56827af2a0d7b0a043c5e6cdc3bad5b (patch) | |
| tree | 068d0e99a0100f64364f6490d5c1e39c34ffc2aa /qmake | |
| parent | 5c63e6fd7541609c3fadb694c071b42e93b7acf5 (diff) | |
| parent | 9c4c136bc9f29bab1cc9684dfced55a92a8bbe96 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I9f802cb9b4d9ccba77ca39428a5cb1afd2d01642
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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; |