API: Be smarter about adding files already matched by wildcards.

The project file does not need an update in this case. Actually, that
would even lead to an error on the next project resolving, as the file
would then be listed twice (once explicitly and once matched by a
pattern).

Task-number: QBS-653
Change-Id: If56969c36d1bba3f9194621690c2e1f25229ee9e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index 5d6a97349..92244f6a4 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
@@ -425,12 +425,9 @@ void ProjectResolver::resolveModule(const QStringList &moduleName, Item *item,
     m_moduleContext = 0;
 }
 
-static void createSourceArtifact(const ResolvedProductConstPtr &rproduct,
-                                 const PropertyMapPtr &properties,
-                                 const QString &fileName,
-                                 const FileTags &fileTags,
-                                 bool overrideTags,
-                                 QList<SourceArtifactPtr> &artifactList)
+SourceArtifactPtr ProjectResolver::createSourceArtifact(const ResolvedProductConstPtr &rproduct,
+        const PropertyMapPtr &properties, const QString &fileName, const FileTags &fileTags,
+        bool overrideTags, QList<SourceArtifactPtr> &artifactList)
 {
     SourceArtifactPtr artifact = SourceArtifact::create();
     artifact->absoluteFilePath = FileInfo::resolvePath(rproduct->sourceDirectory, fileName);
@@ -438,6 +435,7 @@ static void createSourceArtifact(const ResolvedProductConstPtr &rproduct,
     artifact->overrideFileTags = overrideTags;
     artifact->properties = properties;
     artifactList += artifact;
+    return artifact;
 }
 
 static bool isSomeModulePropertySet(Item *group)