Blame qtwebengine-opensource-src-5.8.0-qt57.patch
|
Kevin Kofler |
c815122 |
diff -up qtwebengine-opensource-src-5.8.0/src/core/proxy_config_service_qt.cpp.qt58 qtwebengine-opensource-src-5.8.0/src/core/proxy_config_service_qt.cpp
|
|
Kevin Kofler |
c815122 |
--- qtwebengine-opensource-src-5.8.0/src/core/proxy_config_service_qt.cpp.qt58 2017-01-03 04:35:11.000000000 -0600
|
|
Kevin Kofler |
c815122 |
+++ qtwebengine-opensource-src-5.8.0/src/core/proxy_config_service_qt.cpp 2017-03-24 14:43:55.120363292 -0500
|
|
Kevin Kofler |
c815122 |
@@ -109,7 +109,7 @@ net::ProxyConfigService::ConfigAvailabil
|
|
Kevin Kofler |
c815122 |
}
|
|
Kevin Kofler |
c815122 |
m_qtApplicationProxy = qtProxy;
|
|
Kevin Kofler |
c815122 |
m_qtProxyConfig = net::ProxyConfig();
|
|
Kevin Kofler |
c815122 |
-#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
|
|
Kevin Kofler |
c815122 |
+#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
|
|
Kevin Kofler |
c815122 |
if (qtProxy.type() == QNetworkProxy::NoProxy
|
|
Kevin Kofler |
c815122 |
&& QNetworkProxyFactory::usesSystemConfiguration()) {
|
|
Kevin Kofler |
c815122 |
*config = systemConfig;
|