diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2022-06-17 14:02:55 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-06-24 10:46:33 +0000 |
| commit | de304af3600ab53218191f00d7728cdcdd07b4a8 (patch) | |
| tree | cc54b37c41dbb8d314a800e283d9d184faf3fdb1 /src/qml/qml/qqmllist.h | |
| parent | e0cef42aa0a314f969846fd6035014433bfeeb33 (diff) | |
Fix BC break in qqmlist.h
We need to retain the implementations for the ctors. Also, since the
original change only made it into 6.4, it cannot be deprecated in 6.3.
Change-Id: Iab2f1092ddebe5c1a20ec51c7feabb0197c057bc
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit feca571240e553b56fc87ca60fea9e405fd12ac3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/qml/qml/qqmllist.h')
| -rw-r--r-- | src/qml/qml/qqmllist.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/qml/qml/qqmllist.h b/src/qml/qml/qqmllist.h index 6b5c927f69..051f3d67ff 100644 --- a/src/qml/qml/qqmllist.h +++ b/src/qml/qml/qqmllist.h @@ -162,14 +162,12 @@ class Q_QML_EXPORT QQmlListReference public: QQmlListReference(); -#if QT_DEPRECATED_SINCE(6, 3) +#if QT_DEPRECATED_SINCE(6, 4) QT_DEPRECATED_X("Drop the QQmlEngine* argument") - QQmlListReference(const QVariant &variant, QQmlEngine *) - : QQmlListReference(variant) {} + QQmlListReference(const QVariant &variant, [[maybe_unused]] QQmlEngine *engine); QT_DEPRECATED_X("Drop the QQmlEngine* argument") - QQmlListReference(QObject *o, const char *property, QQmlEngine *) - : QQmlListReference(o, property) {} + QQmlListReference(QObject *o, const char *property, [[maybe_unused]] QQmlEngine *engine); #endif explicit QQmlListReference(const QVariant &variant); |