diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-31 08:24:21 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-31 08:24:21 +0200 |
commit | f510a51dace0cb39a93b057b8fcbcbdda33a956e (patch) | |
tree | cd1dac8a78ecbb7579c59bf9f0b0d2d6fba56b4a /qmake/generators/unix | |
parent | ccedc853a67da078ace234af7b23fbf861736f3f (diff) | |
parent | 84830fc07d65d58fce9b24b5ec8f1224b0969ac0 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I843994939f126ced22f7fe978ec4403f599fc7c9
Diffstat (limited to 'qmake/generators/unix')
-rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 2d6885076d..433731cc4b 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -732,7 +732,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) } if(!meta_files.isEmpty()) t << escapeDependencyPaths(meta_files).join(" ") << ": \n\t" - << "@$(QMAKE) -prl " << buildArgs() << ' ' << escapeFilePath(project->projectFile()) << endl; + << "@$(QMAKE) -prl " << escapeFilePath(project->projectFile()) << ' ' << buildArgs() << endl; } if (!project->isEmpty("QMAKE_BUNDLE")) { |