From 6cc4b9d6af6ed169cdb05a3925e50d353ab8c8a9 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 4 Aug 2015 12:59:20 +0200 Subject: Allow importing JS collections also via the file name syntax. The form "import MyCollection" was supported, the form "import 'mycollection' was not. That does not make any sense. Change-Id: Id57b6749300bfa21cd1afcbc58d234e5c67a963d Reviewed-by: Joerg Bornemann --- src/lib/corelib/language/itemreaderastvisitor.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/lib/corelib/language/itemreaderastvisitor.h') diff --git a/src/lib/corelib/language/itemreaderastvisitor.h b/src/lib/corelib/language/itemreaderastvisitor.h index cf85b852f..68c18c749 100644 --- a/src/lib/corelib/language/itemreaderastvisitor.h +++ b/src/lib/corelib/language/itemreaderastvisitor.h @@ -45,6 +45,7 @@ namespace Internal { class Item; class ItemPool; class ItemReaderVisitorState; +class JsImport; class Version; class ItemReaderASTVisitor : public QbsQmlJS::AST::Visitor @@ -81,6 +82,11 @@ private: static void replaceConditionScopes(const JSSourceValuePtr &value, Item *newScope); void handlePropertiesBlock(Item *item, const Item *block); void collectPrototypes(const QString &path, const QString &as); + + using JsImportsHash = QHash; + void collectPrototypesAndJsCollections(const QString &path, const QString &as, + const CodeLocation &location, JsImportsHash &jsImports); + bool addPrototype(const QString &fileName, const QString &filePath, const QString &as, bool needsCheck); -- cgit v1.2.3