diff options
author | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2023-09-19 11:07:57 +0300 |
---|---|---|
committer | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2023-09-19 18:11:55 +0300 |
commit | 2bb653dd4d3383ab2251a9b57845447362788de8 (patch) | |
tree | 58c75d076f54fe3c278a47f68ca965eee4ebec8a /examples | |
parent | ce7bc27ccc25d266aff23ef030943b27c88b97cf (diff) |
Do not shadow FINAL property modelData
Qt 6.6 changed many properties to FINAL for preventing adding new
properties with same name (QTBUG-108739) and did break accessing
Interface and Service related entries in the model.
Document the model role for accessing underlying delegate properties.
[ChangeLog][Important Behavior Changes][QtDeviceUtilities] Interface
or Service from respective model cannot be no longer accessed by
modelData anymore, use entry instead.
Task-number: QTBUG-117041
Pick-to: 6.6 6.6.0
Change-Id: I467071fddb982093b757d448c0dfaa0ce1ad492a
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Diffstat (limited to 'examples')
3 files changed, 4 insertions, 4 deletions
diff --git a/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/CustomTableView.qml b/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/CustomTableView.qml index 059795c..d7c9917 100644 --- a/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/CustomTableView.qml +++ b/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/CustomTableView.qml @@ -73,7 +73,7 @@ ColumnLayout { id: delegateRectangle width: parent.width height: listView.height * 0.1 - property var delegateData: modelData + property var delegateData: entry Row { anchors.fill: parent diff --git a/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/NetworkListView.qml b/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/NetworkListView.qml index b4f3d0e..424ab74 100644 --- a/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/NetworkListView.qml +++ b/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/NetworkListView.qml @@ -61,7 +61,7 @@ ListView { font.pixelSize: Globals.subTitleFontSize font.family: Globals.appFont color: connected ? Globals.buttonGreenColor : "white" - text: (modelData.type === NetworkSettingsType.Wired) ? modelData["name"] + " (" + modelData["id"] + ")" : name + text: (entry.type === NetworkSettingsType.Wired) ? entry["name"] + " (" + entry["id"] + ")" : name } Row { id: ipRow diff --git a/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/WifiSelectorDelegate.qml b/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/WifiSelectorDelegate.qml index 9c2ad11..bcee3f1 100644 --- a/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/WifiSelectorDelegate.qml +++ b/examples/deviceutilities/settingsuiapp/DeviceUtilities/SettingsUI/Network/WifiSelectorDelegate.qml @@ -47,14 +47,14 @@ ItemDelegate { elide: Text.ElideRight horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter - text: modelData["name"] + text: entry["name"] } WifiSignalMonitor { id: signalMonitor anchors.right: parent.right height: parent.height width: height - signalStrength: modelData.wirelessConfig["signalStrength"] + signalStrength: entry.wirelessConfig["signalStrength"] connected: connected } } |