1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove pointless argument to build_args()

Browse Source 
it's always empty.

Change-Id: Icd97b5ac5b77c119174fdce2671f69c88c607428
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2015-04-13 17:12:28 +02:00
parent 8e380c2021
commit b532250237
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/generators/makefile.cpp
View File

@ -2243,7 +2243,7 @@ QString MakefileGenerator::buildArgs()
//could get stored argv, but then it would have more options than are //could get stored argv, but then it would have more options than are
//probably necesary this will try to guess the bare minimum.. //probably necesary this will try to guess the bare minimum..
QString MakefileGenerator::build_args(const QString &outdir) QString MakefileGenerator::build_args()
{ {
QString ret = "$(QMAKE)"; QString ret = "$(QMAKE)";
@ -2256,7 +2256,7 @@ QString MakefileGenerator::build_args(const QString &outdir)
ret += " -o " + escapeFilePath(ofile); ret += " -o " + escapeFilePath(ofile);
//inputs //inputs
ret += " " + escapeFilePath(fileFixify(project->projectFile(), outdir)); ret += " " + escapeFilePath(fileFixify(project->projectFile()));
return ret; return ret;
} }

2
qmake/generators/makefile.h
View File

@ -60,7 +60,7 @@ class MakefileGenerator : protected QMakeSourceFileInfo
bool no_io; bool no_io;
QHash<QString, bool> init_compiler_already; QHash<QString, bool> init_compiler_already;
QString makedir, chkexists; QString makedir, chkexists;
QString build_args(const QString &outdir=QString()); QString build_args();
//internal caches //internal caches
mutable QHash<QString, QMakeLocalFileName> depHeuristicsCache; mutable QHash<QString, QMakeLocalFileName> depHeuristicsCache;