diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-21 10:40:27 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-02 13:21:09 +0200 |
| commit | 45594322fe91eadcd9b2d7b1d76c1a6662bc1472 (patch) | |
| tree | d14e743f40351ca7a660984616b2500aa83032f5 /src/qml/qml/qqml.h | |
| parent | d621027babff9a30d56ab6af871a465108c9eaba (diff) | |
Use factory functions and ctors for creating value types
As you can extend value types with QML_EXTENDED we may as well allow a
factory function in the extended type. Furthermore, if the original type
allows construction from QJSValue, we may just use that. In turn, we can
get rid of the value type providers now.
Change-Id: I9124ea47537eab6c33d7451080ab2fff942eaa7b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqml.h')
| -rw-r--r-- | src/qml/qml/qqml.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h index 758b0a51cf..be482c5277 100644 --- a/src/qml/qml/qqml.h +++ b/src/qml/qml/qqml.h @@ -172,6 +172,7 @@ int qmlRegisterAnonymousType(const char *uri, int versionMajor) 0, nullptr, nullptr, QString(), + QQmlPrivate::ValueType<T, void>::create, uri, QTypeRevision::fromVersion(versionMajor, 0), nullptr, QQmlPrivate::StaticMetaObject<T>::staticMetaObject(), @@ -206,6 +207,7 @@ int qmlRegisterUncreatableType(const char *uri, int versionMajor, int versionMin nullptr, nullptr, reason, + QQmlPrivate::ValueType<T, void>::create, uri, QTypeRevision::fromVersion(versionMajor, versionMinor), qmlName, QQmlPrivate::StaticMetaObject<T>::staticMetaObject(), @@ -237,6 +239,7 @@ int qmlRegisterUncreatableType(const char *uri, int versionMajor, int versionMin nullptr, nullptr, reason, + QQmlPrivate::ValueType<T, void>::create, uri, QTypeRevision::fromVersion(versionMajor, versionMinor), qmlName, QQmlPrivate::StaticMetaObject<T>::staticMetaObject(), @@ -275,6 +278,7 @@ int qmlRegisterExtendedUncreatableType(const char *uri, int versionMajor, int ve nullptr, nullptr, reason, + QQmlPrivate::ValueType<T, E>::create, uri, QTypeRevision::fromVersion(versionMajor, versionMinor), qmlName, QQmlPrivate::StaticMetaObject<T>::staticMetaObject(), @@ -313,6 +317,7 @@ int qmlRegisterExtendedUncreatableType(const char *uri, int versionMajor, int ve nullptr, nullptr, reason, + QQmlPrivate::ValueType<T, E>::create, uri, QTypeRevision::fromVersion(versionMajor, versionMinor), qmlName, QQmlPrivate::StaticMetaObject<T>::staticMetaObject(), @@ -344,6 +349,7 @@ int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const c QQmlPrivate::QmlMetaType<T>::list(), sizeof(T), QQmlPrivate::Constructors<T>::createInto, nullptr, QString(), + QQmlPrivate::ValueType<T, void>::create, uri, QTypeRevision::fromVersion(versionMajor, versionMinor), qmlName, QQmlPrivate::StaticMetaObject<T>::staticMetaObject(), @@ -373,6 +379,7 @@ int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const c QQmlPrivate::QmlMetaType<T>::list(), sizeof(T), QQmlPrivate::Constructors<T>::createInto, nullptr, QString(), + QQmlPrivate::ValueType<T, void>::create, uri, QTypeRevision::fromVersion(versionMajor, versionMinor), qmlName, QQmlPrivate::StaticMetaObject<T>::staticMetaObject(), @@ -402,6 +409,7 @@ int qmlRegisterRevision(const char *uri, int versionMajor, int versionMinor) QQmlPrivate::QmlMetaType<T>::list(), sizeof(T), QQmlPrivate::Constructors<T>::createInto, nullptr, QString(), + QQmlPrivate::ValueType<T, void>::create, uri, QTypeRevision::fromVersion(versionMajor, versionMinor), nullptr, QQmlPrivate::StaticMetaObject<T>::staticMetaObject(), @@ -433,6 +441,7 @@ int qmlRegisterExtendedType(const char *uri, int versionMajor) nullptr, nullptr, QString(), + QQmlPrivate::ValueType<T, E>::create, uri, QTypeRevision::fromVersion(versionMajor, 0), nullptr, QQmlPrivate::StaticMetaObject<T>::staticMetaObject(), @@ -470,6 +479,7 @@ int qmlRegisterExtendedType(const char *uri, int versionMajor, int versionMinor, QQmlPrivate::QmlMetaType<T>::list(), sizeof(T), QQmlPrivate::Constructors<T>::createInto, nullptr, QString(), + QQmlPrivate::ValueType<T, E>::create, uri, QTypeRevision::fromVersion(versionMajor, versionMinor), qmlName, QQmlPrivate::StaticMetaObject<T>::staticMetaObject(), @@ -518,6 +528,7 @@ int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor, QQmlPrivate::QmlMetaType<T>::list(), sizeof(T), QQmlPrivate::Constructors<T>::createInto, nullptr, QString(), + QQmlPrivate::ValueType<T, void>::create, uri, QTypeRevision::fromVersion(versionMajor, versionMinor), qmlName, QQmlPrivate::StaticMetaObject<T>::staticMetaObject(), @@ -548,6 +559,7 @@ int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor, QQmlPrivate::QmlMetaType<T>::list(), sizeof(T), QQmlPrivate::Constructors<T>::createInto, nullptr, QString(), + QQmlPrivate::ValueType<T, void>::create, uri, QTypeRevision::fromVersion(versionMajor, versionMinor), qmlName, QQmlPrivate::StaticMetaObject<T>::staticMetaObject(), @@ -585,6 +597,7 @@ int qmlRegisterCustomExtendedType(const char *uri, int versionMajor, int version QQmlPrivate::QmlMetaType<T>::list(), sizeof(T), QQmlPrivate::Constructors<T>::createInto, nullptr, QString(), + QQmlPrivate::ValueType<T, E>::create, uri, QTypeRevision::fromVersion(versionMajor, versionMinor), qmlName, QQmlPrivate::StaticMetaObject<T>::staticMetaObject(), @@ -838,6 +851,7 @@ inline void qmlRegisterNamespaceAndRevisions(const QMetaObject *metaObject, 0, nullptr, nullptr, + nullptr, uri, QTypeRevision::fromMajorVersion(versionMajor), |