diff options
Diffstat (limited to 'src/qml/qml/qqmltypenamecache_p.h')
| -rw-r--r-- | src/qml/qml/qqmltypenamecache_p.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/qml/qml/qqmltypenamecache_p.h b/src/qml/qml/qqmltypenamecache_p.h index a9268db37a..841c5aef6b 100644 --- a/src/qml/qml/qqmltypenamecache_p.h +++ b/src/qml/qml/qqmltypenamecache_p.h @@ -74,6 +74,7 @@ public: inline bool isEmpty() const; void add(const QHashedString &name, int sciptIndex = -1, const QHashedString &nameSpace = QHashedString()); + void addSingletonType(const QHashedString &name, QQmlMetaType::SingletonInstance *apiInstance, const QHashedString &nameSpace = QHashedString()); struct Result { inline Result(); @@ -92,7 +93,7 @@ public: Result query(const QHashedStringRef &, const void *importNamespace); Result query(const QHashedV8String &); Result query(const QHashedV8String &, const void *importNamespace); - QQmlMetaType::ModuleApiInstance *moduleApi(const void *importNamespace); + QQmlMetaType::SingletonInstance *singletonType(const void *importNamespace); private: friend class QQmlImports; @@ -100,7 +101,7 @@ private: struct Import { inline Import(); // Imported module - QQmlMetaType::ModuleApiInstance *moduleApi; + QQmlMetaType::SingletonInstance *singletonType; QVector<QQmlTypeModuleVersion> modules; // Or, imported script @@ -172,7 +173,7 @@ bool QQmlTypeNameCache::Result::isValid() const } QQmlTypeNameCache::Import::Import() -: moduleApi(0), scriptIndex(-1) +: singletonType(0), scriptIndex(-1) { } |