Merge remote-tracking branch 'origin/5.10' into dev

 Conflicts:
	.qmake.conf
	src/webengine/api/qquickwebengineview_p_p.h
	src/webenginewidgets/api/qwebenginepage_p.h
	tests/auto/quick/qmltests/data/TestWebEngineView.qml

Change-Id: Id2acc92e8d0364bdaaf5a63ea2d2cb9cd533ade3

1 files changed, 6 insertions, 8 deletions

diff --git a/src/core/proxy_config_service_qt.cpp b/src/core/proxy_config_service_qt.cpp
index cd8f4c0fe..7fca18eb6 100644
--- a/src/core/proxy_config_service_qt.cpp
+++ b/src/core/proxy_config_service_qt.cpp
@@ -52,22 +52,20 @@ using content::BrowserThread;
 
 net::ProxyServer ProxyConfigServiceQt::fromQNetworkProxy(const QNetworkProxy &qtProxy)
 {
-    net::ProxyServer::Scheme proxyScheme = net::ProxyServer::SCHEME_INVALID;
+    net::HostPortPair hostPortPair(qtProxy.hostName().toStdString(), qtProxy.port());
     switch (qtProxy.type()) {
     case QNetworkProxy::Socks5Proxy:
-        proxyScheme = net::ProxyServer::SCHEME_SOCKS5;
-        break;
+        return net::ProxyServer(net::ProxyServer::SCHEME_SOCKS5, hostPortPair);
     case QNetworkProxy::HttpProxy:
     case QNetworkProxy::HttpCachingProxy:
     case QNetworkProxy::FtpCachingProxy:
-        proxyScheme = net::ProxyServer::SCHEME_HTTP;
-        break;
+        return net::ProxyServer(net::ProxyServer::SCHEME_HTTP, hostPortPair);
     case QNetworkProxy::NoProxy:
     case QNetworkProxy::DefaultProxy:
-        proxyScheme = net::ProxyServer::SCHEME_DIRECT;
-            break;
+        return net::ProxyServer(net::ProxyServer::SCHEME_DIRECT, net::HostPortPair());
+    default:
+        return net::ProxyServer(net::ProxyServer::SCHEME_INVALID, net::HostPortPair());
     }
-    return net::ProxyServer(proxyScheme, net::HostPortPair(qtProxy.hostName().toStdString(), qtProxy.port()));
 }
 
 ProxyConfigServiceQt::ProxyConfigServiceQt(std::unique_ptr<ProxyConfigService> baseService)