diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-11-01 15:43:05 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-11-01 15:44:33 +0200 |
| commit | 3728aa03ae5edffca17336be0d93db69283916f9 (patch) | |
| tree | 6630475ef9785f85ecbbdb25e47d98871e0263f3 | |
| parent | 6d67c30eefc6c84de5abc1d95006b2d59cbd3d46 (diff) | |
| parent | 069c88b592fc0e76b0bea35cf256ffe4932cd76b (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
* origin/5.11:
069c88b Fix manual proxy configuration on the C++ side
bbf0e42 Fix the name of the proxy URL property
Change-Id: If7521f05aac2817565b887481507ab27de09ce9c
| -rw-r--r-- | src/networksettings/connman/qnetworksettingsservice_p.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/networksettings/connman/qnetworksettingsservice_p.cpp b/src/networksettings/connman/qnetworksettingsservice_p.cpp index ec53956..b56c1e6 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")); @@ -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; } |