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 | |
| parent | ccedc853a67da078ace234af7b23fbf861736f3f (diff) | |
| parent | 84830fc07d65d58fce9b24b5ec8f1224b0969ac0 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I843994939f126ced22f7fe978ec4403f599fc7c9
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/makefile.cpp | 12 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 11b1c8329d..5d7700ec82 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2269,9 +2269,6 @@ QString MakefileGenerator::build_args() { QString ret = "$(QMAKE)"; - // general options and arguments - ret += buildArgs(); - //output QString ofile = fileFixify(Option::output.fileName()); if(!ofile.isEmpty() && ofile != project->first("QMAKE_MAKEFILE")) @@ -2280,6 +2277,9 @@ QString MakefileGenerator::build_args() //inputs ret += " " + escapeFilePath(fileFixify(project->projectFile())); + // general options and arguments + ret += buildArgs(); + return ret; } @@ -2442,7 +2442,7 @@ MakefileGenerator::writeSubTargetCall(QTextStream &t, if (!in_directory.isEmpty()) t << "\n\t" << mkdir_p_asstring(out_directory); pfx = "( " + chkexists.arg(out) + - + " $(QMAKE) " + in + buildArgs() + " -o " + out + + " $(QMAKE) -o " + out + ' ' + in + buildArgs() + " ) && "; } writeSubMakeCall(t, out_directory_cdin + pfx, makefilein); @@ -2513,7 +2513,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT t << mkdir_p_asstring(out_directory) << out_directory_cdin; } - t << "$(QMAKE) " << in << buildArgs() << " -o " << out; + t << "$(QMAKE) -o " << out << ' ' << in << buildArgs(); if (!dont_recurse) writeSubMakeCall(t, out_directory_cdin, makefilein + " qmake_all"); else @@ -2710,7 +2710,7 @@ MakefileGenerator::writeMakeQmake(QTextStream &t, bool noDummyQmakeAll) if(project->isEmpty("QMAKE_FAILED_REQUIREMENTS") && !project->isEmpty("QMAKE_INTERNAL_PRL_FILE")) { QStringList files = escapeFilePaths(fileFixify(Option::mkfile::project_files)); t << escapeDependencyPath(project->first("QMAKE_INTERNAL_PRL_FILE").toQString()) << ": \n\t" - << "@$(QMAKE) -prl " << buildArgs() << " " << files.join(' ') << endl; + << "@$(QMAKE) -prl " << files.join(' ') << ' ' << buildArgs() << endl; } QString qmake = build_args(); 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")) { |