diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-02-01 11:11:59 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-02-08 12:07:54 +0100 |
commit | 134ee7d932391c7b3c1b801e64e4f5693c3cdd20 (patch) | |
tree | 18c84f15b1b7df86ffd0246aea41d65b6f0c158f /qmake | |
parent | b9d1dc43f2764d765caf9fa8102aafea268ed3bb (diff) |
qmake: Introduce compile_included_sources CONFIG option
By default, qmake does not compile source files that are included in
other source files. The new CONFIG option compile_included_sources
disables this behavior.
Pick-to: 5.15
Fixes: QTBUG-90801
Change-Id: I60c997938895f3a743d32ea385efdbe6bcf315bb
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 3 | ||||
-rw-r--r-- | qmake/generators/makefile.cpp | 9 | ||||
-rw-r--r-- | qmake/generators/makefile.h | 5 |
3 files changed, 13 insertions, 4 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index c14615fdc5..d772ba5fc1 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -1248,6 +1248,9 @@ subproject. \row \li no_include_pwd \li Do not add the current directory to INCLUDEPATHS. + \row \li compile_included_sources \li By default, qmake does not + compile source files that are included in other source files. This + option disables this behavior. \endtable When you use the \c debug_and_release option (which is the default under diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 1f60f29215..41525c5778 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -943,6 +943,15 @@ MakefileGenerator::filterIncludedFiles(const char *var) inputs.removeIf(isIncluded); } +void MakefileGenerator::processSources() +{ + if (project->isActiveConfig("compile_included_sources")) + return; + + filterIncludedFiles("SOURCES"); + filterIncludedFiles("GENERATED_SOURCES"); +} + static QString qv(const ProString &val) { diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index 91016ff34d..720599fd96 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -201,10 +201,7 @@ protected: virtual bool doDepends() const { return Option::mkfile::do_deps; } void filterIncludedFiles(const char *); - void processSources() { - filterIncludedFiles("SOURCES"); - filterIncludedFiles("GENERATED_SOURCES"); - } + void processSources(); //for installs virtual QString defaultInstall(const QString &); |