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

Rename MakefileGenerator::build_args() to ...::fullBuildArgs()

Browse Source 
...because
  - it calls the properly camel-cased member function buildArgs(bool),
    which is slightly confusing
  - it returns buildArgs(true) plus input and output

We also let it return only the arguments, excluding the qmake
executable. This is consistent with the function's name and saves us a
string replacement stunt at one call site.

Change-Id: I8bea65900bd51962962e4cfd425ffbc26e3a52fe
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Joerg Bornemann 2019-07-30 14:31:50 +02:00
parent 7adc1d329f
commit f84ea9a6bd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qmake/generators/makefile.cpp
View File

@ -2299,9 +2299,9 @@ QString MakefileGenerator::buildArgs(bool withExtra)
//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() QString MakefileGenerator::fullBuildArgs()
{ {
QString ret = "$(QMAKE)"; QString ret;
//output //output
QString ofile = fileFixify(Option::output.fileName()); QString ofile = fileFixify(Option::output.fileName());
@ -2326,7 +2326,7 @@ MakefileGenerator::writeHeader(QTextStream &t)
t << "# Project: " << fileFixify(project->projectFile()) << Qt::endl; t << "# Project: " << fileFixify(project->projectFile()) << Qt::endl;
t << "# Template: " << var("TEMPLATE") << Qt::endl; t << "# Template: " << var("TEMPLATE") << Qt::endl;
if(!project->isActiveConfig("build_pass")) if(!project->isActiveConfig("build_pass"))
t << "# Command: " << build_args().replace(QLatin1String("$(QMAKE)"), var("QMAKE_QMAKE")) << Qt::endl; t << "# Command: " << var("QMAKE_QMAKE") << fullBuildArgs() << Qt::endl;
t << "#############################################################################\n"; t << "#############################################################################\n";
t << Qt::endl; t << Qt::endl;
QString ofile = Option::fixPathToTargetOS(Option::output.fileName()); QString ofile = Option::fixPathToTargetOS(Option::output.fileName());
@ -2792,7 +2792,7 @@ MakefileGenerator::writeMakeQmake(QTextStream &t, bool noDummyQmakeAll)
<< "@$(QMAKE) -prl " << files.join(' ') << ' ' << buildArgs(true) << Qt::endl; << "@$(QMAKE) -prl " << files.join(' ') << ' ' << buildArgs(true) << Qt::endl;
} }
QString qmake = build_args(); QString qmake = "$(QMAKE)" + fullBuildArgs();
if(!ofile.isEmpty() && !project->isActiveConfig("no_autoqmake")) { if(!ofile.isEmpty() && !project->isActiveConfig("no_autoqmake")) {
t << escapeDependencyPath(ofile) << ": " t << escapeDependencyPath(ofile) << ": "
<< escapeDependencyPath(fileFixify(project->projectFile())) << " "; << escapeDependencyPath(fileFixify(project->projectFile())) << " ";

2
qmake/generators/makefile.h
View File

@ -58,7 +58,7 @@ class MakefileGenerator : protected QMakeSourceFileInfo
bool resolveDependenciesInFrameworks = false; bool resolveDependenciesInFrameworks = false;
QHash<QString, bool> init_compiler_already; QHash<QString, bool> init_compiler_already;
QString makedir, chkexists; QString makedir, chkexists;
QString build_args(); QString fullBuildArgs();
//internal caches //internal caches
mutable QHash<QString, QMakeLocalFileName> depHeuristicsCache; mutable QHash<QString, QMakeLocalFileName> depHeuristicsCache;