4 files changed, 19 insertions, 4 deletions
diff --git a/src/app/qbs-setup-android/qbs-setup-android.qbs b/src/app/qbs-setup-android/qbs-setup-android.qbs
index edadd5dd1..949c07c45 100644
--- a/src/app/qbs-setup-android/qbs-setup-android.qbs
+++ b/src/app/qbs-setup-android/qbs-setup-android.qbs
@@ -12,6 +12,11 @@ QbsApp {
     Group {
         name: "MinGW specific files"
         condition: qbs.toolchain.contains("mingw")
-        files: ["qbs-setup-android.exe.manifest", "qbs-setup-android.rc"]
+        files: "qbs-setup-android.rc"
+        Group {
+            name: "qbs-setup-android manifest"
+            files: "qbs-setup-android.exe.manifest"
+            fileTags: []  // the manifest is referenced by the rc file
+        }
     }
 }
diff --git a/src/app/qbs-setup-qt/qbs-setup-qt.qbs b/src/app/qbs-setup-qt/qbs-setup-qt.qbs
index f4cd9d6b8..44f2b7f05 100644
--- a/src/app/qbs-setup-qt/qbs-setup-qt.qbs
+++ b/src/app/qbs-setup-qt/qbs-setup-qt.qbs
@@ -12,7 +12,12 @@ QbsApp {
     Group {
         name: "MinGW specific files"
         condition: qbs.toolchain.contains("mingw")
-        files: ["qbs-setup-qt.exe.manifest", "qbs-setup-qt.rc"]
+        files: "qbs-setup-qt.rc"
+        Group {
+            name: "qbs-setup-qt manifest"
+            files: "qbs-setup-qt.exe.manifest"
+            fileTags: [] // the manifest is referenced by the rc file
+        }
     }
 }
 
diff --git a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
index 554891fc4..3bc72700f 100644
--- a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
+++ b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
@@ -27,6 +27,11 @@ QbsApp {
     Group {
         name: "MinGW specific files"
         condition: qbs.toolchain.contains("mingw")
-        files: ["qbs-setup-toolchains.exe.manifest", "qbs-setup-toolchains.rc"]
+        files: "qbs-setup-toolchains.rc"
+        Group {
+            name: "qbs-setup-toolchains manifest"
+            files: "qbs-setup-toolchains.exe.manifest"
+            fileTags: [] // the manifest is referenced by the rc file
+        }
     }
 }
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index 09bfb00e8..1c331c60d 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -3844,7 +3844,7 @@ QVariantMap ModuleLoader::moduleProviderConfig(ModuleLoader::ProductContext &pro
                 product.theModuleProviderConfig.insert(name.toString(), m);
             }
         };
-        configItemValue->item()->setScope(product.scope);
+        configItemValue->item()->setScope(product.item);
         collectMap(configItemValue->item(), QualifiedId());
     }
     for (auto it = product.moduleProperties.begin(); it != product.moduleProperties.end(); ++it) {