diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2025-09-05 16:10:04 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2025-09-12 03:27:53 +0000 |
| commit | 793efe73beedc53737fa30c9c8cbea3fe61c8361 (patch) | |
| tree | f620a508d5d996b0a6d25c17f6201ddbcc8ce9fe | |
| parent | c670b70527b3da5b42f4d25c314bab2738c81f4b (diff) | |
QQmlDelegateModel: Drop FINAL from some properties
The dynamic metaobject of QQmlDelegateModelAttached likes to override
them, which produces warnings.
Amends commit 9355b7173c10045f7908bf16a97ba693967517e1.
Pick-to: 6.8
Change-Id: Iaf0d6627fe6c373177f7f28a750fa2baf5fa2a7e
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
(cherry picked from commit a97083d5977874f66bd5abf2b1aaa1a73d2be9a3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit edd434aa3a1cddb16c69d606758f923b9513db52)
| -rw-r--r-- | src/qmlmodels/qqmldelegatemodel_p.h | 8 | ||||
| -rw-r--r-- | tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/qmlmodels/qqmldelegatemodel_p.h b/src/qmlmodels/qqmldelegatemodel_p.h index fcebfcf0c5..8dab870949 100644 --- a/src/qmlmodels/qqmldelegatemodel_p.h +++ b/src/qmlmodels/qqmldelegatemodel_p.h @@ -205,10 +205,10 @@ class QQmlDelegateModelAttached : public QObject Q_PROPERTY(QQmlDelegateModel *model READ model CONSTANT FINAL) Q_PROPERTY(QStringList groups READ groups WRITE setGroups NOTIFY groupsChanged FINAL) Q_PROPERTY(bool isUnresolved READ isUnresolved NOTIFY unresolvedChanged FINAL) - Q_PROPERTY(bool inPersistedItems READ inPersistedItems WRITE setInPersistedItems NOTIFY groupsChanged FINAL) - Q_PROPERTY(bool inItems READ inItems WRITE setInItems NOTIFY groupsChanged FINAL) - Q_PROPERTY(int persistedItemsIndex READ persistedItemsIndex NOTIFY groupsChanged FINAL) - Q_PROPERTY(int itemsIndex READ itemsIndex NOTIFY groupsChanged FINAL) + Q_PROPERTY(bool inPersistedItems READ inPersistedItems WRITE setInPersistedItems NOTIFY groupsChanged) + Q_PROPERTY(bool inItems READ inItems WRITE setInItems NOTIFY groupsChanged) + Q_PROPERTY(int persistedItemsIndex READ persistedItemsIndex NOTIFY groupsChanged) + Q_PROPERTY(int itemsIndex READ itemsIndex NOTIFY groupsChanged) public: QQmlDelegateModelAttached(QObject *parent); diff --git a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp index 0821669703..70364a33e3 100644 --- a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp +++ b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp @@ -3959,6 +3959,8 @@ void tst_qquickvisualdatamodel::invalidAttachment() void tst_qquickvisualdatamodel::declarativeAssignViaAttached() { + QTest::failOnWarning(); + QQmlComponent component(&engine); component.loadUrl(testFileUrl("attachedDeclarativelySet.qml")); |