diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2018-10-17 19:28:27 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2019-02-04 15:33:44 +0000 |
| commit | 740922cc2d7a9b90956d2cf7923c996d79e98a2a (patch) | |
| tree | dacc532ba7d06f48a6700b2d0b09a0df1f2386da /tests | |
| parent | 17cc1a0cbe37ac33200012eb49c17e3b48c90a55 (diff) | |
Add proxy switches handling
This change adds switches for proxy:
https://www.chromium.org/developers/design-documents/network-settings
[ChangeLog] Uses proxy switches for initial proxy configuration
Fixes: QTBUG-71229
Change-Id: I1bc02f20c20d737234c650a18f0e0f7c1c63a464
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/widgets/proxypac/proxypac.pro | 24 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets.pro | 6 |
2 files changed, 5 insertions, 25 deletions
diff --git a/tests/auto/widgets/proxypac/proxypac.pro b/tests/auto/widgets/proxypac/proxypac.pro index 00ae90977..1c2958d3a 100644 --- a/tests/auto/widgets/proxypac/proxypac.pro +++ b/tests/auto/widgets/proxypac/proxypac.pro @@ -3,26 +3,8 @@ QT += webengine HEADERS += proxyserver.h SOURCES += proxyserver.cpp -# QTBUG-71229 -xgd_desktop.name=XDG_CURRENT_DESKTOP -xgd_desktop.value=KDE -QT_TOOL_ENV += xgd_desktop +proxy_pac.name = QTWEBENGINE_CHROMIUM_FLAGS +proxy_pac.value = --proxy-pac-url="file://$$PWD/proxy.pac" -kde_home.name=KDEHOME -kde_home.value=$$OUT_PWD -QT_TOOL_ENV += kde_home - -PROXY_CONFIG= \ - "[Proxy Settings]" \ - "Proxy Config Script=$$PWD/proxy.pac" \ - "ProxyType=2" - -mkpath($$OUT_PWD/share/config) -KDE_FILE = $$OUT_PWD/share/config/kioslaverc - -!build_pass { - write_file($$KDE_FILE, PROXY_CONFIG) -} - -QMAKE_DISTCLEAN += $$KDE_FILE +QT_TOOL_ENV += proxy_pac diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro index eec8bb389..0addb9671 100644 --- a/tests/auto/widgets/widgets.pro +++ b/tests/auto/widgets/widgets.pro @@ -9,6 +9,7 @@ SUBDIRS += \ faviconmanager \ loadsignals \ origins \ + proxypac \ schemes \ shutdown \ qwebenginedownloaditem \ @@ -27,9 +28,6 @@ qtConfig(webengine-printing-and-pdf) { SUBDIRS += printing } -# QTBUG-71229 -linux:!boot2qt: SUBDIRS += proxypac - qtConfig(webengine-spellchecker):!cross_compile { !qtConfig(webengine-native-spellchecker) { SUBDIRS += spellchecking @@ -43,4 +41,4 @@ boot2qt: SUBDIRS -= accessibility defaultsurfaceformat devtools \ faviconmanager qwebenginepage qwebenginehistory \ qwebengineprofile qwebenginescript \ qwebengineview qwebenginedownloaditem qwebenginesettings \ - schemes origins loadsignals + schemes origins loadsignals proxypac |