remove JSSourceValue::Alternative::conditionScopeItem

This member held the scope item for the condition of JSSourceValue
alternatives (Properties items). However, the condition scope is
always the same as the scope item of the JSSourceValue itself.
The missing part was that we need to make sure that the scopes always
have a valid FileContext pointer.

Removing this member made it possible to remove
ItemReaderResult::conditionalValuesPerScopeItem as well.

This patch will enable us to implement item inheritance by using the
prototype chain.

Change-Id: I77e976cdfc5af072e35d430b055b6ae1fac930a4
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

1 files changed, 1 insertions, 2 deletions

diff --git a/src/lib/corelib/language/itemreaderastvisitor.h b/src/lib/corelib/language/itemreaderastvisitor.h
index 109f0a753..dae481c3b 100644
--- a/src/lib/corelib/language/itemreaderastvisitor.h
+++ b/src/lib/corelib/language/itemreaderastvisitor.h
@@ -66,8 +66,7 @@ private:
     Item *targetItemForBinding(Item *item, const QStringList &binding,
                                  const JSSourceValueConstPtr &value);
     void checkImportVersion(const QbsQmlJS::AST::SourceLocation &versionToken) const;
-    static void inheritItem(Item *dst, const Item *src,
-                          const ItemReaderResult &baseFile);
+    static void inheritItem(Item *dst, const Item *src);
     void ensureIdScope(const FileContextPtr &file);
     void setupAlternatives(Item *item);
     static void replaceConditionScopes(const JSSourceValuePtr &value, Item *newScope);