diff options
| author | Ville Voutilainen <ville.voutilainen@qt.io> | 2018-10-26 16:50:44 +0300 |
|---|---|---|
| committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2018-10-29 12:00:05 +0000 |
| commit | 027ad461dff0c39bee7944394d7a4124e51a31f0 (patch) | |
| tree | d9c339e206a3938488cc8321e9ca0d9e62ae34c4 | |
| parent | df590e2cceaa29ce21b104a5872397c8c1a9e602 (diff) | |
Fix manual proxy configuration setting
Change-Id: I3dff374e7bff185a4931fa5c1f480df89bba596c
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| -rw-r--r-- | src/networksettings/connman/qnetworksettingsservice_p.cpp | 10 | ||||
| -rw-r--r-- | src/settingsui/network/EditWiredSettings.qml | 7 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/networksettings/connman/qnetworksettingsservice_p.cpp b/src/networksettings/connman/qnetworksettingsservice_p.cpp index d6a1c69..d7880c0 100644 --- a/src/networksettings/connman/qnetworksettingsservice_p.cpp +++ b/src/networksettings/connman/qnetworksettingsservice_p.cpp @@ -230,10 +230,12 @@ const QVariantMap &operator<<(QVariantMap &argument, const QNetworkSettingsProxy break; } argument.insert(PropertyMethod, QVariant::fromValue(method)); - argument.insert(PropertyUrl, QVariant::fromValue(obj.url().toString())); - argument.insert(PropertyServers, QVariant::fromValue(obj.servers())); - argument.insert(PropertyServers, QVariant::fromValue(obj.excludes())); - + if (method == AttributeAuto) { + argument.insert(PropertyUrl, QVariant::fromValue(obj.url().toString())); + } else if (method == AttributeManual) { + argument.insert(PropertyServers, QVariant::fromValue(obj.servers())); + argument.insert(PropertyExcludes, QVariant::fromValue(obj.excludes())); + } return argument; } diff --git a/src/settingsui/network/EditWiredSettings.qml b/src/settingsui/network/EditWiredSettings.qml index 857c8e9..63cefce 100644 --- a/src/settingsui/network/EditWiredSettings.qml +++ b/src/settingsui/network/EditWiredSettings.qml @@ -310,9 +310,16 @@ Item { Layout.fillWidth: true onTextChanged: proxyChanged = true; onAccepted: service.proxy.url = text; + visible: service.proxy.method === NetworkSettingsProxy.Auto } } AddressListEntry { + model: service.proxy.servers + modified: proxyChanged + title: qsTr("Proxy urls:") + visible: service.proxy.method === NetworkSettingsProxy.Manual + } + AddressListEntry { model: service.proxy.excludes modified: proxyChanged title: qsTr("No proxy for:") |