summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2017-03-29 16:58:09 +0200
committerKai Koehne <kai.koehne@qt.io>2017-03-30 15:01:30 +0000
commit77ed783f38e68668e6ba0b4cb922b204c168524b (patch)
treef403f57737fa54f5193cae2edfa61cf094cf3bf6
parentb37ae374ae4a3d96b512465287ceaac7d58c1df5 (diff)
DemoBrowser: Fix use of system proxy
The example did always set an application proxy, though it was empty if no proxy was explicitly set in the system. This however blocked the use of the system settings. Task-number: QTBUG-58748 Change-Id: I50d9116e491cb7c1ab5b8fc610736d60e0bc9ea8 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
-rw-r--r--examples/webenginewidgets/demobrowser/browserapplication.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/webenginewidgets/demobrowser/browserapplication.cpp b/examples/webenginewidgets/demobrowser/browserapplication.cpp
index 995626bb9..32429a675 100644
--- a/examples/webenginewidgets/demobrowser/browserapplication.cpp
+++ b/examples/webenginewidgets/demobrowser/browserapplication.cpp
@@ -332,8 +332,8 @@ void BrowserApplication::loadSettings()
proxy.setPort(settings.value(QLatin1String("port"), 1080).toInt());
proxy.setUser(settings.value(QLatin1String("userName")).toString());
proxy.setPassword(settings.value(QLatin1String("password")).toString());
+ QNetworkProxy::setApplicationProxy(proxy);
}
- QNetworkProxy::setApplicationProxy(proxy);
settings.endGroup();
}