diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-11-14 13:00:52 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-11-18 10:37:48 +0100 |
| commit | c5675c9c8f549beb9966644277010eb847c72bcd (patch) | |
| tree | 226470a4dbd17ba287c43c0e6a5aa30a5743ed24 | |
| parent | 02b8c8ed160014c976ca3dd5266d1ef4f557a774 (diff) | |
Disable deprecation warnings in function that are themselves deprecated
Deprecated functions calling each other is not worthy of warning, as
they will all be removed at the same time.
Task-number: QTBUG-80040
Change-Id: I4c2b31474e3ee8168fd48796cf99ead266dffb37
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 0fd07ea209..435f158e74 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -1627,6 +1627,9 @@ static QObject *resolveAttachedProperties(QQmlAttachedPropertiesFunc pf, QQmlDat } #if QT_DEPRECATED_SINCE(5, 14) +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED + QObject *qmlAttachedPropertiesObjectById(int id, const QObject *object, bool create) { QQmlData *data = QQmlData::get(object, create); @@ -1654,6 +1657,8 @@ QObject *qmlAttachedPropertiesObject(int *idCache, const QObject *object, return qmlAttachedPropertiesObjectById(*idCache, object, create); } + +QT_WARNING_POP #endif QQmlAttachedPropertiesFunc qmlAttachedPropertiesFunction(QObject *object, @@ -1682,6 +1687,8 @@ QObject *qmlAttachedPropertiesObject(QObject *object, QQmlAttachedPropertiesFunc } // namespace QtQml #if QT_DEPRECATED_SINCE(5, 1) +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED // Also define symbols outside namespace to keep binary compatibility with Qt 5.0 @@ -1712,6 +1719,7 @@ Q_QML_EXPORT QObject *qmlAttachedPropertiesObject(int *idCache, const QObject *o return QtQml::qmlAttachedPropertiesObject(idCache, object, attachedMetaObject, create); } +QT_WARNING_POP #endif // QT_DEPRECATED_SINCE(5, 1) class QQmlDataExtended { |