Merge 1.11 into master

Change-Id: I9603ade37a1f839019c9219c940dcbb95c1cac89

1 files changed, 7 insertions, 1 deletions

diff --git a/src/lib/corelib/language/moduleloader.h b/src/lib/corelib/language/moduleloader.h
index f0d9281bc..bb1fc7761 100644
--- a/src/lib/corelib/language/moduleloader.h
+++ b/src/lib/corelib/language/moduleloader.h
@@ -152,6 +152,7 @@ private:
 
         Item *item;
         Item *scope;
+        QString name;
     };
 
     class ProjectContext;
@@ -163,7 +164,6 @@ private:
     public:
         ProjectContext *project;
         ModuleLoaderResult::ProductInfo info;
-        QString name;
         QString profileName;
         QString multiplexConfigurationId;
         QString multiplexConfigIdForModulePrototypes;
@@ -340,6 +340,9 @@ private:
     void evaluateProfileValues(const QualifiedId &namePrefix, Item *item, Item *profileItem,
                                QVariantMap &values);
     void handleProfile(Item *profileItem);
+    void collectNameFromOverride(const QString &overrideString);
+    void checkProjectNamesInOverrides(const TopLevelProjectContext &tlp);
+    void checkProductNamesInOverrides();
 
     ItemPool *m_pool;
     Logger &m_logger;
@@ -388,6 +391,9 @@ private:
     quint64 m_probesRun;
     quint64 m_probesCachedCurrent;
     quint64 m_probesCachedOld;
+    Set<QString> m_projectNamesUsedInOverrides;
+    Set<QString> m_productNamesUsedInOverrides;
+    Set<QString> m_disabledProjects;
 };
 
 } // namespace Internal