Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9

453f0260 · Allan Sandfeld Jensen · The Qt Project · e2862280 · d5e44f9b · 453f0260
Commit 453f0260 authored 7 years ago by Allan Sandfeld Jensen Committed by The Qt Project 7 years ago
--- a/tests/auto/bic/data/QtWebEngine.5.8.0.linux-gcc-amd64.txt
+++ b/tests/auto/bic/data/QtWebEngine.5.8.0.linux-gcc-amd64.txt
--- a/tests/auto/bic/data/QtWebEngineCore.5.8.0.linux-gcc-amd64.txt
+++ b/tests/auto/bic/data/QtWebEngineCore.5.8.0.linux-gcc-amd64.txt
--- a/tests/auto/bic/data/QtWebEngineWidgets.5.8.0.linux-gcc-amd64.txt
+++ b/tests/auto/bic/data/QtWebEngineWidgets.5.8.0.linux-gcc-amd64.txt
--- a/tests/global/global.cfg
+++ b/tests/global/global.cfg
+<config>
+<modules>
+<module name="QtWebEngine"          qtname="webengine"/>
+<module name="QtWebEngineCore"      qtname="webenginecore"/>
+<module name="QtWebEngineWidgets"   qtname="webenginewidgets"/>
+</modules>
+</config>