From b5322502372893a9270e9981e7d4223da96ccfc2 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 13 Apr 2015 17:12:28 +0200 Subject: remove pointless argument to build_args() it's always empty. Change-Id: Icd97b5ac5b77c119174fdce2671f69c88c607428 Reviewed-by: Joerg Bornemann --- qmake/generators/makefile.cpp | 4 ++-- qmake/generators/makefile.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'qmake') 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 init_compiler_already; QString makedir, chkexists; - QString build_args(const QString &outdir=QString()); + QString build_args(); //internal caches mutable QHash depHeuristicsCache; -- cgit v1.2.3