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>

6 files changed, 10 insertions, 8 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
         }
     }
diff --git a/src/networksettings/qnetworksettingsinterfacemodel.cpp b/src/networksettings/qnetworksettingsinterfacemodel.cpp
index 7efd8e3..95eff25 100644
--- a/src/networksettings/qnetworksettingsinterfacemodel.cpp
+++ b/src/networksettings/qnetworksettingsinterfacemodel.cpp
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 QNetworkSettingsInterfaceModel::QNetworkSettingsInterfaceModel(QObject *parent)
     : QAbstractListModel(parent)
 {
-    m_roleNames.insert(Qt::UserRole, "modelData");
+    m_roleNames.insert(Qt::UserRole, "entry");
     m_roleNames.insert(Type, "type");
     m_roleNames.insert(Status, "status");
     m_roleNames.insert(Name, "name");
diff --git a/src/networksettings/qnetworksettingsservicemodel.cpp b/src/networksettings/qnetworksettingsservicemodel.cpp
index 087da80..6ddeb09 100644
--- a/src/networksettings/qnetworksettingsservicemodel.cpp
+++ b/src/networksettings/qnetworksettingsservicemodel.cpp
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 QNetworkSettingsServiceModel::QNetworkSettingsServiceModel(QObject *parent)
     : QAbstractListModel(parent)
 {
-    m_roleNames.insert(Qt::UserRole, "modelData");
+    m_roleNames.insert(Qt::UserRole, "entry");
     m_roleNames.insert(Name, "name");
     m_roleNames.insert(SignalStrength, "signalStrength");
     m_roleNames.insert(Connected, "connected");
diff --git a/src/networksettingsqml/qnetworksettingsforeign.cpp b/src/networksettingsqml/qnetworksettingsforeign.cpp
index e3d1414..e0d73c0 100644
--- a/src/networksettingsqml/qnetworksettingsforeign.cpp
+++ b/src/networksettingsqml/qnetworksettingsforeign.cpp
@@ -69,7 +69,9 @@
     \qmlproperty model NetworkSettingsManager::services
     \readonly
 
-    Holds the service model.
+    Holds the service model. A delegate in a view that uses
+    the \e services model can access the NetworkService
+    item with the \e entry role.
 
     The services list in the model can be controlled with the
     \c type property, and NetworkService items can be retrieved
@@ -99,7 +101,7 @@
 
     Holds the interface model. A delegate in a view that uses
     the \e interfaces model can access the NetworkInterface
-    item with the \e dataModel role.
+    item with the \e entry role.
 
     \sa NetworkInterface
 */