diff options
author | Ville Voutilainen <ville.voutilainen@qt.io> | 2018-11-01 14:49:23 +0200 |
---|---|---|
committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2018-11-01 12:55:41 +0000 |
commit | 069c88b592fc0e76b0bea35cf256ffe4932cd76b (patch) | |
tree | 1363300a28f4012aca8af6194cf9f3ca80ec7793 | |
parent | bbf0e42324667be2f364745877121cab768b5ede (diff) |
Fix manual proxy configuration on the C++ side
Change-Id: I702ae14b749e03a6cc96a982a9e7dad6f562a8a2
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
-rw-r--r-- | src/networksettings/connman/qnetworksettingsservice_p.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/networksettings/connman/qnetworksettingsservice_p.cpp b/src/networksettings/connman/qnetworksettingsservice_p.cpp index 8b4a084..b56c1e6 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; } |