From 92659bacda53da782c84dff44d3caa2590dbc7cc Mon Sep 17 00:00:00 2001 From: Xizhi Zhu Date: Thu, 15 Mar 2012 10:26:39 +0100 Subject: [PATCH] Make sure QGlobalNetworkProxy is created for QNetworkProxy. Otherwise, you don't have any socket engine handler created when directly setting a proxy to a socket. Change-Id: I35cd7f52331672a6d3e7bcdf817c0fe1fd1e7de3 Reviewed-by: Shane Kearns --- src/network/kernel/qnetworkproxy.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index feef74e..8d30e81 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -426,6 +426,10 @@ template<> void QSharedDataPointer::detach() QNetworkProxy::QNetworkProxy() : d(0) { + // make sure we have QGlobalNetworkProxy singleton created, otherwise + // you don't have any socket engine handler created when directly setting + // a proxy to a socket + globalNetworkProxy(); } /*! @@ -440,6 +444,10 @@ QNetworkProxy::QNetworkProxy(ProxyType type, const QString &hostName, quint16 po const QString &user, const QString &password) : d(new QNetworkProxyPrivate(type, hostName, port, user, password)) { + // make sure we have QGlobalNetworkProxy singleton created, otherwise + // you don't have any socket engine handler created when directly setting + // a proxy to a socket + globalNetworkProxy(); } /*! -- 2.7.4