aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristian Adam <cristian.adam@qt.io>2021-06-09 15:48:59 +0200
committerCristian Adam <cristian.adam@qt.io>2021-06-09 15:03:42 +0000
commit4c699d518110554f9ca3ff4ab1ad09dc4c089fc1 (patch)
tree214e77621bce39dcf1c6979853a6f0c2e3177871
parent80d18c1e5746f912dfeeff84cc38745446b37009 (diff)
CMakePM: Enable extra compilers only for files in the project
Qt Creator 4.15 added the "<File System>" project node containing all the files in the source directory. Qt Creator for its "find extra compilers" step needs only the files from the project and not all the files in the system. Task-number: QTCREATORBUG-25783 Change-Id: I5d33d5296f67ab3f321c232e5071f32e56d29101 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
index 94eeb5032e..54de9efb68 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -1142,7 +1142,7 @@ QList<ProjectExplorer::ExtraCompiler *> CMakeBuildSystem::findExtraCompilers()
// Find all files generated by any of the extra compilers, in a rather crude way.
Project *p = project();
const FilePaths fileList = p->files([&fileExtensions](const Node *n) {
- if (!Project::SourceFiles(n))
+ if (!Project::SourceFiles(n) || !n->isEnabled()) // isEnabled excludes nodes from the file system tree
return false;
const QString fp = n->filePath().toString();
const int pos = fp.lastIndexOf('.');