diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2021-01-25 11:48:11 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-01-25 15:54:45 +0100 |
commit | 5006de6166c11568696495b92cdbc2cf4dd6f695 (patch) | |
tree | 8a522789f3953ea85bad023d479702596cc6c96d /src | |
parent | cd8ae755c2762cedc98f7f389f13ab827e125e11 (diff) |
Move qmlRegisterUncreatableMetaObject to qqml.cpp
There is no reason to keep it in qqmlengine.cpp as it is declared in
qqml.h.
Change-Id: I0a0261b943c4a3b4333d7161becbd68ad4f1b21e
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/qml/qml/qqml.cpp | 33 | ||||
-rw-r--r-- | src/qml/qml/qqmlengine.cpp | 34 |
2 files changed, 33 insertions, 34 deletions
diff --git a/src/qml/qml/qqml.cpp b/src/qml/qml/qqml.cpp index 9e71c968b8..77c5226a97 100644 --- a/src/qml/qml/qqml.cpp +++ b/src/qml/qml/qqml.cpp @@ -53,6 +53,39 @@ QT_BEGIN_NAMESPACE +int qmlRegisterUncreatableMetaObject(const QMetaObject &staticMetaObject, + const char *uri, int versionMajor, + int versionMinor, const char *qmlName, + const QString& reason) +{ + QQmlPrivate::RegisterType type = { + 0, + QMetaType(), + QMetaType(), + 0, + nullptr, + nullptr, + reason, + nullptr, + + uri, QTypeRevision::fromVersion(versionMajor, versionMinor), qmlName, &staticMetaObject, + + QQmlAttachedPropertiesFunc(), + nullptr, + + 0, + 0, + 0, + + nullptr, nullptr, + + nullptr, + QTypeRevision::zero() + }; + + return QQmlPrivate::qmlregister(QQmlPrivate::TypeRegistration, &type); +} + void qmlClearTypeRegistrations() // Declared in qqml.h { QQmlMetaType::clearTypeRegistrations(); diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 3c86bdbb1b..ae36fde7f0 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -105,40 +105,6 @@ QT_BEGIN_NAMESPACE -// Declared in qqml.h -int qmlRegisterUncreatableMetaObject(const QMetaObject &staticMetaObject, - const char *uri, int versionMajor, - int versionMinor, const char *qmlName, - const QString& reason) -{ - QQmlPrivate::RegisterType type = { - 0, - QMetaType(), - QMetaType(), - 0, - nullptr, - nullptr, - reason, - nullptr, - - uri, QTypeRevision::fromVersion(versionMajor, versionMinor), qmlName, &staticMetaObject, - - QQmlAttachedPropertiesFunc(), - nullptr, - - 0, - 0, - 0, - - nullptr, nullptr, - - nullptr, - QTypeRevision::zero() - }; - - return QQmlPrivate::qmlregister(QQmlPrivate::TypeRegistration, &type); -} - /*! \qmltype QtObject \instantiates QObject |