diff options
author | Liang Qi <liang.qi@qt.io> | 2017-09-20 18:57:07 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-09-20 18:57:07 +0000 |
commit | 112d668c0fded8c6ab7bf40fd3800cf43e005f95 (patch) | |
tree | b23889851a0d8c779bd7f2f3605375f8adc1cb05 /src/qml/qml/qqmlmetatype_p.h | |
parent | ae805cafde1f327c9252b9d08449a08f052746d4 (diff) | |
parent | 55a671ea73fbe657f360befa221e2c0c15ed4b0e (diff) |
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
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 8eb91f321a..720c6d904a 100644 --- a/src/qml/qml/qqmlmetatype_p.h +++ b/src/qml/qml/qqmlmetatype_p.h @@ -253,6 +253,7 @@ public: QQmlTypePrivate *priv() const { return d; } static void refHandle(QQmlTypePrivate *priv); static void derefHandle(QQmlTypePrivate *priv); + static int refCount(QQmlTypePrivate *priv); enum RegistrationType { CppType = 0, @@ -307,6 +308,8 @@ public: QQmlType type(const QHashedStringRef &, int) const; QQmlType type(const QV4::String *, int) const; + void walkCompositeSingletons(const std::function<void(const QQmlType &)> &callback) const; + QQmlTypeModulePrivate *priv() { return d; } private: //Used by register functions and creates the QQmlTypeModule for them |