diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-01 01:00:48 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-07-01 10:29:06 +0200 |
| commit | e6c6cc8fde26bd0b9d37a1812593f17df0b4159a (patch) | |
| tree | 6aae6724e24a1e051d271e5f67baab5acc358313 /src/qml/qml/qqmlmetatype_p.h | |
| parent | 16289f35eb08a9b9a6d56ea8dec549b1f17e4daf (diff) | |
| parent | 3ecec55e534214aced70ccab7cc929cfb57738a2 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/imports/imports.pro
src/qml/qml/qqmlmetatype.cpp
Change-Id: I308436caf55402cb2246cb591c6ac8f83e1febf8
Diffstat (limited to 'src/qml/qml/qqmlmetatype_p.h')
| -rw-r--r-- | src/qml/qml/qqmlmetatype_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h index 911e519cf2..c2535a7fd5 100644 --- a/src/qml/qml/qqmlmetatype_p.h +++ b/src/qml/qml/qqmlmetatype_p.h @@ -176,7 +176,9 @@ public: } } - static int registerAutoParentFunction(QQmlPrivate::RegisterAutoParent &autoparent); + static int registerAutoParentFunction(const QQmlPrivate::RegisterAutoParent &autoparent); + static void unregisterAutoParentFunction(const QQmlPrivate::AutoParentFunction &function); + static int registerUnitCacheHook(const QQmlPrivate::RegisterQmlUnitCacheHook &hookRegistration); static void clearTypeRegistrations(); |