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

Change-Id: I7f11733bda960196a96c6452bdabeb7072a8430d

1 files changed, 2 insertions, 5 deletions

diff --git a/src/network/kernel/qnetworkproxy_mac.cpp b/src/network/kernel/qnetworkproxy_mac.cpp
index 92f91956b9..67fda24ea6 100644
--- a/src/network/kernel/qnetworkproxy_mac.cpp
+++ b/src/network/kernel/qnetworkproxy_mac.cpp
@@ -210,16 +210,14 @@ QList<QNetworkProxy> macQueryInternal(const QNetworkProxyQuery &query)
     QList<QNetworkProxy> result;
 
     // obtain a dictionary to the proxy settings:
-    CFDictionaryRef dict = SCDynamicStoreCopyProxies(NULL);
+    const QCFType<CFDictionaryRef> dict = SCDynamicStoreCopyProxies(NULL);
     if (!dict) {
         qWarning("QNetworkProxyFactory::systemProxyForQuery: SCDynamicStoreCopyProxies returned NULL");
         return result;          // failed
     }
 
-    if (isHostExcluded(dict, query.peerHostName())) {
-        CFRelease(dict);
+    if (isHostExcluded(dict, query.peerHostName()))
         return result;          // no proxy for this host
-    }
 
     // is there a PAC enabled? If so, use it first.
     CFNumberRef pacEnabled;
@@ -329,7 +327,6 @@ QList<QNetworkProxy> macQueryInternal(const QNetworkProxyQuery &query)
             result << https;
     }
 
-    CFRelease(dict);
     return result;
 }