diff options
| author | Lassi Lehikoinen <lassi.lehikoinen@qt.io> | 2020-12-16 15:21:23 +0200 |
|---|---|---|
| committer | Lassi Lehikoinen <lassi.lehikoinen@qt.io> | 2020-12-21 10:33:50 +0200 |
| commit | a1df8e45166f15ed77e2ef8b3ad6757299662dc7 (patch) | |
| tree | 96d355ea2e3cd6cdac0ada865e85130c0adeae6d /src/settingsui/network/NetworkSettings.qml | |
| parent | aa9223a4d7d410aa8a12495fef5c3f36a2c79ffe (diff) | |
Modify settingsui to work against Qt 6
Following modules are removed in Qt 6
- XmlListModel
- QtGraphicalEffects
Adapt settingsui to work without them.
Also remove needless resources and make miscallaneous improvements.
Task-number: QTBUG-89065
Change-Id: Ie66d73e4d8f9c1dd4cbec2fe5f9f71f32f7d1bdf
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'src/settingsui/network/NetworkSettings.qml')
| -rw-r--r-- | src/settingsui/network/NetworkSettings.qml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/settingsui/network/NetworkSettings.qml b/src/settingsui/network/NetworkSettings.qml index 8aa8cc0..a0555f4 100644 --- a/src/settingsui/network/NetworkSettings.qml +++ b/src/settingsui/network/NetworkSettings.qml @@ -26,11 +26,11 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.2 -import QtDeviceUtilities.NetworkSettings 1.0 -import QtDeviceUtilities.QtButtonImageProvider 1.0 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import QtDeviceUtilities.NetworkSettings +import QtDeviceUtilities.QtButtonImageProvider import "../common" Item { @@ -88,7 +88,7 @@ Item { anchors.top: wlanText.bottom anchors.left: wifiSwitch.right anchors.right: manualDisconnect.left - anchors.rightMargin: 15 + anchors.rightMargin: 10 enabled: wifiSwitch.checked fillColor: enabled ? viewSettings.buttonGreenColor : viewSettings.buttonGrayColor borderColor: "transparent" @@ -115,12 +115,13 @@ Item { } Text { id: networkListTextItem - text: qsTr("Network list") + text: qsTr("Network list:") font.pixelSize: pluginMain.subTitleFontSize font.family: appFont font.styleName: "SemiBold" color: "white" anchors.top: wifiSwitch.bottom + anchors.topMargin: 10 } NetworkListView { id: networkList |