summaryrefslogtreecommitdiffstats
path: root/qmake/generators/makefile.cpp
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-02-01 11:11:59 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2021-02-08 12:07:54 +0100
commit134ee7d932391c7b3c1b801e64e4f5693c3cdd20 (patch)
tree18c84f15b1b7df86ffd0246aea41d65b6f0c158f /qmake/generators/makefile.cpp
parentb9d1dc43f2764d765caf9fa8102aafea268ed3bb (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/generators/makefile.cpp')
-rw-r--r--qmake/generators/makefile.cpp9
1 files changed, 9 insertions, 0 deletions
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)
{