1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/corelib/language/moduleloader.h b/src/lib/corelib/language/moduleloader.h
index df853e77f..3dc091003 100644
--- a/src/lib/corelib/language/moduleloader.h
+++ b/src/lib/corelib/language/moduleloader.h
@@ -106,7 +106,7 @@ struct ModuleLoaderResult
 
     std::shared_ptr<ItemPool> itemPool;
     Item *root;
-    QHash<Item *, ProductInfo> productInfos;
+    std::unordered_map<Item *, ProductInfo> productInfos;
     std::vector<ProbeConstPtr> projectProbes;
     ModuleProviderInfoList moduleProviderInfo;
     Set<QString> qbsFiles;
@@ -187,8 +187,7 @@ private:
 
         std::vector<QStringList> newlyAddedModuleProviderSearchPaths;
         Set<QualifiedId> knownModuleProviders;
-        QVariantMap theModuleProviderConfig;
-        bool moduleProviderConfigRetrieved = false;
+        std::optional<QVariantMap> theModuleProviderConfig;
 
         // The key corresponds to DeferredDependsContext.exportingProductItem, which is the
         // only value from that data structure that we still need here.