feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Fix library-by-path imports.

Browse Source 
Fixes the problem 5426c3ac2c and
7b25f438c6 worked around.

Reviewed-by: Erik Verbruggen
This commit is contained in:
Christian Kamm
2011-04-20 10:46:04 +02:00
parent e40a0ca990
commit e21311132b
4 changed files with 87 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libs/qmljs/qmljsinterpreter.h
View File

@@ -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