diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-07 13:45:07 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-12 18:15:42 +0100 |
commit | 7f7bf177f41d7824aecee9f046a8a63ef4d82521 (patch) | |
tree | 7c79982a3b3eb6a5e91f7751704918b25bb81b10 /src/qml/qml/qqml.h | |
parent | 8791fc19f04d51d1efc077205e39a11047e732b5 (diff) |
Provide a macro for qmlRegisterTypeNotAvailable
That is, register QQmlTypeNotAvailable as foreign type under the name
given as parameter. Also, statically register QQuickAnimatedImage as
unavailable in case of !quick_animatedimage and register it for the
right version.
Task-number: QTBUG-68796
Change-Id: I2ea292d2aeda66d8ce43b3bccbd3d21663330bd6
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/qqml.h')
-rw-r--r-- | src/qml/qml/qqml.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h index 153cb0c071..ef7fdd1945 100644 --- a/src/qml/qml/qqml.h +++ b/src/qml/qml/qqml.h @@ -120,6 +120,9 @@ template<typename T, typename... Args> \ friend void QML_REGISTER_TYPES_AND_REVISIONS(const char *uri, int versionMajor); +#define QML_UNAVAILABLE \ + QML_FOREIGN(QQmlTypeNotAvailable) + enum { /* TYPEINFO flags */ QML_HAS_ATTACHED_PROPERTIES = 0x01 }; @@ -183,7 +186,8 @@ QT_DEPRECATED_VERSION_X_5_14("Use qmlRegisterAnonymousType instead") int qmlRegi } #endif -int Q_QML_EXPORT qmlRegisterTypeNotAvailable(const char *uri, int versionMajor, int versionMinor, const char *qmlName, const QString& message); +int Q_QML_EXPORT qmlRegisterTypeNotAvailable(const char *uri, int versionMajor, int versionMinor, + const char *qmlName, const QString& message); template<typename T> int qmlRegisterUncreatableType(const char *uri, int versionMajor, int versionMinor, const char *qmlName, const QString& reason) |