diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-04-27 10:03:12 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-04-27 10:03:43 +0200 |
| commit | 10e66c6dd0b8a8dd17252d6408c13b689fac6995 (patch) | |
| tree | fbdddb33a818b5495b24f3949f7406b0b916e78c /tests/auto/widgets/proxypac/proxypac.pro | |
| parent | d0852f90a24673ccc9ef0b93e224ba37b674644d (diff) | |
| parent | 75412200db05ddc5ee2b9aea367b580d8b0c438e (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
configure.pri
src/pdf/api/qpdfpagerenderer.h
Change-Id: I7e68277080e29238bbfe8511539ea75b2db89489
Diffstat (limited to 'tests/auto/widgets/proxypac/proxypac.pro')
| -rw-r--r-- | tests/auto/widgets/proxypac/proxypac.pro | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/tests/auto/widgets/proxypac/proxypac.pro b/tests/auto/widgets/proxypac/proxypac.pro index 2aacb4366..f2a43d41f 100644 --- a/tests/auto/widgets/proxypac/proxypac.pro +++ b/tests/auto/widgets/proxypac/proxypac.pro @@ -1,13 +1,4 @@ -include(../tests.pri) -QT += webengine -HEADERS += proxyserver.h -SOURCES += proxyserver.cpp - -proxy_pac.name = QTWEBENGINE_CHROMIUM_FLAGS - -win32:proxy_pac.value = --proxy-pac-url="file:///$$PWD/proxy.pac" -else:proxy_pac.value = --proxy-pac-url="file://$$PWD/proxy.pac" -boot2qt:proxy_pac.value = "--single-process --no-sandbox --proxy-pac-url=file://$$PWD/proxy.pac" - -QT_TOOL_ENV += proxy_pac +TEMPLATE = subdirs +SUBDIRS = proxypac_file proxypac_qrc +CONFIG += ordered |