diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-09-17 09:25:30 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-09-18 19:58:49 +0200 |
| commit | 1cef434ae29d21bd46adb26d84ff37eec596985c (patch) | |
| tree | ba87a5a8a1ca1bc9c65df4d710f0cac2cd8375d4 | |
| parent | 84a5969daf095190af1ea3c3174b31c053fcbd59 (diff) | |
Fix deprecation macros in qqml.h
Give a friendly message for qmlAttachedPropertiesObject(int ...) and
disable plain qmlRegisterType<Foo>() if QT_DEPRECATED_SINCE(5, 14).
Change-Id: I9373f38fdddcb58ec1211b6cab492e1bc5370e52
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | src/qml/qml/qqml.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h index 6295345fa4..b2bf1f328f 100644 --- a/src/qml/qml/qqml.h +++ b/src/qml/qml/qqml.h @@ -133,11 +133,13 @@ int qmlRegisterAnonymousType(const char *uri, int versionMajor) return QQmlPrivate::qmlregister(QQmlPrivate::TypeRegistration, &type); } +#if QT_DEPRECATED_SINCE(5, 14) template<typename T> QT_DEPRECATED_VERSION_X_5_14("Use qmlRegisterAnonymousType instead") int qmlRegisterType() { return qmlRegisterAnonymousType<T>("", 1); } +#endif int Q_QML_EXPORT qmlRegisterTypeNotAvailable(const char *uri, int versionMajor, int versionMinor, const char *qmlName, const QString& message); @@ -586,8 +588,10 @@ namespace QtQml { Q_QML_EXPORT QQmlContext *qmlContext(const QObject *); Q_QML_EXPORT QQmlEngine *qmlEngine(const QObject *); #if QT_DEPRECATED_SINCE(5, 14) - Q_QML_EXPORT QT_DEPRECATED QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true); - Q_QML_EXPORT QT_DEPRECATED QObject *qmlAttachedPropertiesObject( + Q_QML_EXPORT QT_DEPRECATED_VERSION_X_5_14("Use qmlAttachedPropertiesObject(QObject *, QQmlAttachedPropertiesFunc, bool") + QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true); + Q_QML_EXPORT QT_DEPRECATED_VERSION_X_5_14("Use qmlAttachedPropertiesObject(QObject *, QQmlAttachedPropertiesFunc, bool") + QObject *qmlAttachedPropertiesObject( int *, const QObject *, const QMetaObject *, bool create); #endif Q_QML_EXPORT QQmlAttachedPropertiesFunc qmlAttachedPropertiesFunction(QObject *, |