diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-13 17:12:28 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-04-21 12:06:03 +0000 |
| commit | b5322502372893a9270e9981e7d4223da96ccfc2 (patch) | |
| tree | 476609ece6f224703b6cdd516ca2a78a2d264c05 | |
| parent | 8e380c2021aa40796e7924c70d9906cfbd6ab677 (diff) | |
remove pointless argument to build_args()
it's always empty.
Change-Id: Icd97b5ac5b77c119174fdce2671f69c88c607428
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | qmake/generators/makefile.cpp | 4 | ||||
| -rw-r--r-- | qmake/generators/makefile.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index f2decd71a5..e6eb6e27cd 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2243,7 +2243,7 @@ QString MakefileGenerator::buildArgs() //could get stored argv, but then it would have more options than are //probably necesary this will try to guess the bare minimum.. -QString MakefileGenerator::build_args(const QString &outdir) +QString MakefileGenerator::build_args() { QString ret = "$(QMAKE)"; @@ -2256,7 +2256,7 @@ QString MakefileGenerator::build_args(const QString &outdir) ret += " -o " + escapeFilePath(ofile); //inputs - ret += " " + escapeFilePath(fileFixify(project->projectFile(), outdir)); + ret += " " + escapeFilePath(fileFixify(project->projectFile())); return ret; } diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index 7282d3ad1f..d57fdbaca3 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -60,7 +60,7 @@ class MakefileGenerator : protected QMakeSourceFileInfo bool no_io; QHash<QString, bool> init_compiler_already; QString makedir, chkexists; - QString build_args(const QString &outdir=QString()); + QString build_args(); //internal caches mutable QHash<QString, QMakeLocalFileName> depHeuristicsCache; |