markQGlobalNetworkProxy::applicationProxy() and markQGlobalNetworkProxy::proxyForQuer...

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index 60da568..ec0889c 100644 (file)
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -233,8 +233,7 @@ class QGlobalNetworkProxy
 {
 public:
     QGlobalNetworkProxy()
-        : mutex(QMutex::Recursive)
-        , applicationLevelProxy(Q_NULLPTR)
+        : applicationLevelProxy(Q_NULLPTR)
         , applicationLevelProxyFactory(new QSystemConfigurationProxyFactory())
 #ifndef QT_NO_SOCKS5
         , socks5SocketEngineHandler(new QSocks5SocketEngineHandler())
@@ -279,12 +278,12 @@ public:
         applicationLevelProxyFactory = factory;
     }
 
-    QNetworkProxy applicationProxy()
+    QNetworkProxy applicationProxy() const
     {
         return proxyForQuery(QNetworkProxyQuery()).first();
     }
 
-    QList<QNetworkProxy> proxyForQuery(const QNetworkProxyQuery &query);
+    QList<QNetworkProxy> proxyForQuery(const QNetworkProxyQuery &query) const;
 
 private:
     QMutex mutex;
@@ -298,10 +297,8 @@ private:
 #endif
 };
 
-QList<QNetworkProxy> QGlobalNetworkProxy::proxyForQuery(const QNetworkProxyQuery &query)
+QList<QNetworkProxy> QGlobalNetworkProxy::proxyForQuery(const QNetworkProxyQuery &query) const
 {
-    QMutexLocker locker(&mutex);
-
     QList<QNetworkProxy> result;
 
     // don't look for proxies for a local connection