QmlJS: Fix library-by-path imports.

Fixes the problem 5426c3ac2cdf898ca1190a7746ba506ff24abc50 and
7b25f438c67c7cf395ccd2cd846e5d413f6d9222 worked around.

Reviewed-by: Erik Verbruggen

1 files changed, 9 insertions, 4 deletions

diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h
index 636cc955239..a14158678b4 100644
--- a/src/libs/qmljs/qmljsinterpreter.h
+++ b/src/libs/qmljs/qmljsinterpreter.h
@@ -633,11 +633,12 @@ public:
                                         LanguageUtils::ComponentVersion version) const;
 
 private:
-    QmlObjectValue *makeObject(Engine *engine,
-                               LanguageUtils::FakeMetaObject::ConstPtr metaObject,
-                               const LanguageUtils::FakeMetaObject::Export &exp);
     void setPrototypes(QmlObjectValue *object);
-    QmlObjectValue *getOrCreate(const QString &package, const QString &cppName);
+    QmlObjectValue *getOrCreate(Engine *engine,
+                                LanguageUtils::FakeMetaObject::ConstPtr metaObject,
+                                const LanguageUtils::FakeMetaObject::Export &exp,
+                                bool *wasCreated = 0);
+    QmlObjectValue *getOrCreateForPackage(const QString &package, const QString &cppName);
 
 
     QHash<QString, QList<QmlObjectValue *> > _typesByPackage;
@@ -1036,6 +1037,10 @@ public:
 
     void addImport(const ObjectValue *import, const ImportInfo &info);
     ImportInfo importInfo(const QString &name, const Context *context) const;
+
+#ifdef QT_DEBUG
+    void dump() const;
+#endif
 };
 
 } } // namespace QmlJS::Interpreter