diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-07-30 14:31:50 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2019-07-31 09:04:34 +0200 |
| commit | f84ea9a6bddecd2d8831b4449c7fbcb913ffe435 (patch) | |
| tree | 00c40c8e2df4cf9ab108cc2286f063ae17cf54ec /qmake/generators/makefile.h | |
| parent | 7adc1d329ff85d4dd03cb950f06132b03a5df9ed (diff) | |
Rename MakefileGenerator::build_args() to ...::fullBuildArgs()
...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>
Diffstat (limited to 'qmake/generators/makefile.h')
| -rw-r--r-- | qmake/generators/makefile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index c7b2bee0b4..4d1b998197 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -58,7 +58,7 @@ class MakefileGenerator : protected QMakeSourceFileInfo bool resolveDependenciesInFrameworks = false; QHash<QString, bool> init_compiler_already; QString makedir, chkexists; - QString build_args(); + QString fullBuildArgs(); //internal caches mutable QHash<QString, QMakeLocalFileName> depHeuristicsCache; |