diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-03-29 10:05:09 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-29 21:20:22 +0100 |
| commit | ed9a71b85849a653a3cc710e59b885002fc6f506 (patch) | |
| tree | 61ea8efcc39bca1e0d55f0b87e66164ef51d98b6 /src/qml/qml/qqmlmetatype_p.h | |
| parent | 869a199da9ba173e2dea948ec132d089b2513128 (diff) | |
Make it possible to supply compilation units from plugins
This also cleans up the script and type initialization in
the type loader, for example by getting rid of the m_irUnit
member for scripts.
Change-Id: I207afeb21c0bae9091d3c7b4cac2e80e9aae0ea3
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlmetatype_p.h')
| -rw-r--r-- | src/qml/qml/qqmlmetatype_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h index 019e6b8821..44ea7e284a 100644 --- a/src/qml/qml/qqmlmetatype_p.h +++ b/src/qml/qml/qqmlmetatype_p.h @@ -125,6 +125,8 @@ public: static void setQQuickAnchorLineCompareFunction(CompareFunction); static bool QQuickAnchorLineCompare(const void *p1, const void *p2); + static const QQmlPrivate::CachedQmlUnit *findCachedCompilationUnit(const QUrl &uri); + static bool namespaceContainsRegistrations(const QString &); static void protectNamespace(const QString &); @@ -240,6 +242,7 @@ private: friend int registerInterface(const QQmlPrivate::RegisterInterface &); friend int registerCompositeType(const QQmlPrivate::RegisterCompositeType &); friend int registerCompositeSingletonType(const QQmlPrivate::RegisterCompositeSingletonType &); + friend int registerQmlUnitCacheHook(const QQmlPrivate::RegisterQmlUnitCacheHook &); friend Q_QML_EXPORT void qmlClearTypeRegistrations(); QQmlType(int, const QQmlPrivate::RegisterInterface &); QQmlType(int, const QString &, const QQmlPrivate::RegisterSingletonType &); |