summaryrefslogtreecommitdiffstats
path: root/src/core/core_gyp_generator.pro
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@theqtcompany.com>2015-05-13 15:22:08 +0200
committerPierre Rossi <pierre.rossi@theqtcompany.com>2015-05-29 11:50:56 +0000
commit47ee541a9f0f8ee811187cf37838264379153163 (patch)
treea542bba8b6b9d2ceb37edb540ce164078058ae92 /src/core/core_gyp_generator.pro
parente4361807da9db0609697e7a650947dbf26321cdc (diff)
Support QNetworkProxy::applicationProxy
Implement a ProxyConfigService that keeps track of the state of Qt's application proxy which, if set, takes precedence over the system settings. Change-Id: I7f1eba9015b70cf90f53a41736dd0a6d0ad28489 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 07ce48317..c2eb9bff1 100644
--- a/src/core/core_gyp_generator.pro
+++ b/src/core/core_gyp_generator.pro
@@ -58,6 +58,7 @@ SOURCES = \
network_delegate_qt.cpp \
ozone_platform_eglfs.cpp \
process_main.cpp \
+ proxy_config_service_qt.cpp \
qrc_protocol_handler_qt.cpp \
qt_render_view_observer_host.cpp \
render_widget_host_view_qt.cpp \
@@ -126,6 +127,7 @@ HEADERS = \
network_delegate_qt.h \
ozone_platform_eglfs.h \
process_main.h \
+ proxy_config_service_qt.h \
qrc_protocol_handler_qt.h \
qt_render_view_observer_host.h \
qtwebenginecoreglobal.h \