Merge 1.12 into master

Change-Id: I44f8e2c5f3fbe8fc67deada65a4136257572239e

1 files changed, 3 insertions, 3 deletions

diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index 4f871c17f..7deb964b3 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
@@ -101,7 +101,7 @@ struct ProjectResolver::ProductContext
     Item *item;
     typedef std::pair<ArtifactPropertiesPtr, std::vector<CodeLocation>> ArtifactPropertiesInfo;
     QHash<QStringList, ArtifactPropertiesInfo> artifactPropertiesPerFilter;
-    QHash<QString, CodeLocation> sourceArtifactLocations;
+    ProjectResolver::FileLocations sourceArtifactLocations;
     GroupConstPtr currentGroup;
 };
 
@@ -602,7 +602,7 @@ void ProjectResolver::gatherProductTypes(ResolvedProduct *product, Item *item)
 
 SourceArtifactPtr ProjectResolver::createSourceArtifact(const ResolvedProductPtr &rproduct,
         const QString &fileName, const GroupPtr &group, bool wildcard,
-        const CodeLocation &filesLocation, QHash<QString, CodeLocation> *fileLocations,
+        const CodeLocation &filesLocation, FileLocations *fileLocations,
         ErrorInfo *errorInfo)
 {
     const QString &baseDir = FileInfo::path(group->location.filePath());
@@ -614,7 +614,7 @@ SourceArtifactPtr ProjectResolver::createSourceArtifact(const ResolvedProductPtr
         return SourceArtifactPtr();
     }
     if (group->enabled && fileLocations) {
-        CodeLocation &loc = (*fileLocations)[absFilePath];
+        CodeLocation &loc = (*fileLocations)[std::make_pair(group->targetOfModule, absFilePath)];
         if (loc.isValid()) {
             if (errorInfo) {
                 errorInfo->append(Tr::tr("Duplicate source file '%1'.").arg(absFilePath));