From cee7367f72c4c2321e6f324bb36be0b6923db640 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Thu, 1 Feb 2018 16:40:57 +0100
Subject: Check product and project names in command-line property overrides

Users should get feedback if they mistyped a product name, for instance.

Task-number: QBS-1288
Change-Id: Icb57490d896d21c5ff9ed3940b53d9b18fe00a30
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 src/lib/corelib/language/moduleloader.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/lib/corelib/language/moduleloader.h')

diff --git a/src/lib/corelib/language/moduleloader.h b/src/lib/corelib/language/moduleloader.h
index 3dafd42de..8eafb54da 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;
@@ -378,6 +381,9 @@ private:
     Version m_qbsVersion;
     Item *m_tempScopeItem = nullptr;
     qint64 m_elapsedTimeProbes;
+    Set<QString> m_projectNamesUsedInOverrides;
+    Set<QString> m_productNamesUsedInOverrides;
+    Set<QString> m_disabledProjects;
 };
 
 } // namespace Internal
-- 
cgit v1.2.3