Do not apply file tags filter to target artifacts of modules

These do not conceptually belong to the product.

Change-Id: Ic55cf246fe38ba7ad03563b5f67a8622810dad7d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

2 files changed, 5 insertions, 1 deletions

diff --git a/src/lib/corelib/language/language.h b/src/lib/corelib/language/language.h
index 6bfbfb379..eee51532a 100644
--- a/src/lib/corelib/language/language.h
+++ b/src/lib/corelib/language/language.h
@@ -210,6 +210,8 @@ class SourceArtifactInternal
 public:
     static SourceArtifactPtr create() { return SourceArtifactPtr(new SourceArtifactInternal); }
 
+    bool isTargetOfModule() const { return !targetOfModule.isEmpty(); }
+
     QString absoluteFilePath;
     FileTags fileTags;
     bool overrideFileTags;
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index 7f0c68130..4ebb38135 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
@@ -1118,8 +1118,10 @@ void ProjectResolver::matchArtifactProperties(const ResolvedProductPtr &product,
     for (const SourceArtifactPtr &artifact : artifacts) {
         for (const ArtifactPropertiesConstPtr &artifactProperties :
                  qAsConst(product->artifactProperties)) {
-            if (artifact->fileTags.intersects(artifactProperties->fileTagsFilter()))
+            if (!artifact->isTargetOfModule()
+                    && artifact->fileTags.intersects(artifactProperties->fileTagsFilter())) {
                 artifact->properties = artifactProperties->propertyMap();
+            }
         }
     }
 }