Merge remote-tracking branch 'origin/5.9' into 5.105.10

* origin/5.9:
  Fix the appearance of network settings
  Doc: Bump version to 5.9.4

Conflicts:
   .qmake.conf

Change-Id: I5ab18bbe6ec854060407507cad99c1f34a027b3f

1 files changed, 16 insertions, 20 deletions

diff --git a/src/settingsui/network/NetworkSettings.qml b/src/settingsui/network/NetworkSettings.qml
index 947aae5..bb09954 100644
--- a/src/settingsui/network/NetworkSettings.qml
+++ b/src/settingsui/network/NetworkSettings.qml
@@ -76,33 +76,29 @@ Item {
                     Layout.fillWidth: true
                     implicitHeight: 54
 
+                    indicator: Item {}
                     contentItem: Rectangle {
                         color: checked ? "#80c342" : "white"
                         border.color: "#bdbebf"
                         border.width: 1
                         anchors.fill: parent
 
-                        Row {
-                            anchors.fill: parent
-                            spacing: 10
-
-                            Image {
-                                id: typeId
-                                height: parent.height
-                                width: height
+                        Column {
+                            height: parent.height * .7
+                            width: parent.width
+                            spacing: 0
+                            anchors.verticalCenter: parent.verticalCenter
+                            Label {
+                                width: parent.width
+                                horizontalAlignment: Text.AlignHCenter
+                                text: name
                             }
-                            Column {
-                                height: parent.height * .7
-                                spacing: 0
-                                anchors.verticalCenter: parent.verticalCenter
-                                Label {
-                                    text: name
-                                }
-                                Label {
-                                    text: ((type == NetworkSettingsType.Wired) && !NetworkSettingsManager.services.wiredNetworksAvailable) ?
-                                              qsTr("No networks") : networkSelect.stateToStr(modelData.state)
-                                    font.pixelSize: 12
-                                }
+                            Label {
+                                width: parent.width
+                                horizontalAlignment: Text.AlignHCenter
+                                text: ((type == NetworkSettingsType.Wired) && !NetworkSettingsManager.services.wiredNetworksAvailable) ?
+                                          qsTr("No networks") : networkSelect.stateToStr(modelData.state)
+                                font.pixelSize: 12
                             }
                         }
                     }