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/qqmlprivate.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/qqmlprivate.h')
| -rw-r--r-- | src/qml/qml/qqmlprivate.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlprivate.h b/src/qml/qml/qqmlprivate.h index a07736c6fc..eff78195d9 100644 --- a/src/qml/qml/qqmlprivate.h +++ b/src/qml/qml/qqmlprivate.h @@ -321,6 +321,7 @@ namespace QQmlPrivate }; int Q_QML_EXPORT qmlregister(RegistrationType, void *); + void Q_QML_EXPORT qmlunregister(RegistrationType, quintptr); } QT_END_NAMESPACE |