diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:16 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:34 +0200 |
| commit | 440286655e0ca271506cf7cc02ad0dbf4baef9ca (patch) | |
| tree | 896fa81adb8b14a69355a3a6cf64d06ec8173c9a /qmake/generators/makefile.h | |
| parent | 1e27ad1697187549151657ba187928e439300db7 (diff) | |
| parent | e164d61ca8263fc4b46fdd916e1ea77c7dd2b735 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf
Diffstat (limited to 'qmake/generators/makefile.h')
| -rw-r--r-- | qmake/generators/makefile.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index 45250a6aa2..18c27a4385 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -86,7 +86,8 @@ protected: QString resolveDependency(const QDir &outDir, const QString &file); void callExtraCompilerDependCommand(const ProString &extraCompiler, const QString &dep_cd_cmd, const QString &tmp_dep_cmd, const QString &inpf, - const QString &tmp_out, bool dep_lines, QStringList *deps); + const QString &tmp_out, bool dep_lines, QStringList *deps, + bool existingDepsOnly); void writeExtraCompilerTargets(QTextStream &t); void writeExtraCompilerVariables(QTextStream &t); bool writeDummyMakefile(QTextStream &t); |