diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-15 13:09:55 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-15 16:53:19 +0200 |
| commit | c7ec7cd2a1ae9bec31113fae1f1e549b2bf98e0b (patch) | |
| tree | fc81fba4e7815ea061da277cf3bcf3102866932f /qmake/generators/makefile.h | |
| parent | 7947032e2d1d68b2c0f79874db7adcf560851f29 (diff) | |
| parent | 6132260da394a9627947f0fe6a279c20863b6ad2 (diff) | |
Merge branch 'wip/qt6' into wip/cmake
Change-Id: I50ac36b8803c296998149e98cc61e38687cdd14b
Diffstat (limited to 'qmake/generators/makefile.h')
| -rw-r--r-- | qmake/generators/makefile.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index c7b2bee0b4..ac1d5abb11 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; @@ -90,7 +90,6 @@ protected: void writeExtraCompilerTargets(QTextStream &t); void writeExtraCompilerVariables(QTextStream &t); bool writeDummyMakefile(QTextStream &t); - virtual bool writeStubMakefile(QTextStream &t); virtual bool writeMakefile(QTextStream &t); virtual void writeDefaultVariables(QTextStream &t); |