summaryrefslogtreecommitdiffstats
path: root/src/core/core_gyp_generator.pro
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@theqtcompany.com>2015-05-21 17:28:44 +0200
committerPierre Rossi <pierre.rossi@theqtcompany.com>2015-06-08 11:17:33 +0000
commit0e006b8ea755ebad01faf3e747e61abdf158289a (patch)
tree28fbc979b8576fa6c22044785e6c59d8f1048252 /src/core/core_gyp_generator.pro
parent8c3178b64d992435cb90a426ff075fee6778e04a (diff)
Introduce ProxyResolverQt
This allows using QtNetwork's proxy auto conf detection code from QNetworkProxyFactory, by setting the QTWEBENGINE_USE_QT_PROXYRESOLVER environment variable. Otherwise, we still rely on chromium's implementation. Task-number: QTBUG-45376 Change-Id: I7b8b77c932060ad36090d388d616b713d93cad0a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/core/core_gyp_generator.pro')
-rw-r--r--src/core/core_gyp_generator.pro2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index f9df7710b..494924054 100644
--- a/src/core/core_gyp_generator.pro
+++ b/src/core/core_gyp_generator.pro
@@ -59,6 +59,7 @@ SOURCES = \
ozone_platform_eglfs.cpp \
process_main.cpp \
proxy_config_service_qt.cpp \
+ proxy_resolver_qt.cpp \
qrc_protocol_handler_qt.cpp \
qt_render_view_observer_host.cpp \
render_widget_host_view_qt.cpp \
@@ -128,6 +129,7 @@ HEADERS = \
ozone_platform_eglfs.h \
process_main.h \
proxy_config_service_qt.h \
+ proxy_resolver_qt.h \
qrc_protocol_handler_qt.h \
qt_render_view_observer_host.h \
qtwebenginecoreglobal.h \