From bbf0e42324667be2f364745877121cab768b5ede Mon Sep 17 00:00:00 2001 From: Ville Voutilainen Date: Thu, 25 Oct 2018 19:03:38 +0300 Subject: Fix the name of the proxy URL property Change-Id: I070538b9e7cafd4a79128280c05ca2503a539858 Reviewed-by: Teemu Holappa --- src/networksettings/connman/qnetworksettingsservice_p.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/networksettings/connman/qnetworksettingsservice_p.cpp b/src/networksettings/connman/qnetworksettingsservice_p.cpp index ec53956..8b4a084 100644 --- a/src/networksettings/connman/qnetworksettingsservice_p.cpp +++ b/src/networksettings/connman/qnetworksettingsservice_p.cpp @@ -49,7 +49,7 @@ const QString PropertyGateway(QStringLiteral("Gateway")); const QString PropertyPrefixLength(QStringLiteral("PrefixLength")); const QString PropertyMethod(QStringLiteral("Method")); const QString PropertyPrivacy(QStringLiteral("Privacy")); -const QString PropertyUrl(QStringLiteral("Url")); +const QString PropertyUrl(QStringLiteral("URL")); const QString PropertyServers(QStringLiteral("Servers")); const QString PropertyExcludes(QStringLiteral("Excludes")); const QString PropertyStrength(QStringLiteral("Strength")); -- cgit v1.2.3 From 069c88b592fc0e76b0bea35cf256ffe4932cd76b Mon Sep 17 00:00:00 2001 From: Ville Voutilainen Date: Thu, 1 Nov 2018 14:49:23 +0200 Subject: Fix manual proxy configuration on the C++ side Change-Id: I702ae14b749e03a6cc96a982a9e7dad6f562a8a2 Reviewed-by: Teemu Holappa --- src/networksettings/connman/qnetworksettingsservice_p.cpp | 10 ++++++---- 1 file 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; } -- cgit v1.2.3