Merge remote-tracking branch 'origin/5.12' into dev

Conflicts:
	.qmake.conf
	src/core/net/network_delegate_qt.cpp
	src/core/profile_io_data_qt.cpp
	src/core/web_engine_context.h
	tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp

Change-Id: Id98e3f52f548ceb5b68abd80aedd6ae59db72cc0

2 files changed, 2 insertions, 2 deletions

diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
index 0721bdd2c..d7d382a4f 100644
--- a/mkspecs/features/configure.prf
+++ b/mkspecs/features/configure.prf
@@ -91,7 +91,7 @@ defineTest(runConfigure) {
          }
 
         !qtConfig(webengine-embedded-build): qtConfig(xcb) {
-             for(package, $$list("libdrm xcomposite xcursor xi xrandr xtst")) {
+             for(package, $$list("libdrm xcomposite xcursor xi xtst")) {
                  !qtConfig(webengine-system-$$package) {
                      skipBuild("A suitable version of $$package could not be found.")
                      return(false)
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
index f433de3b2..f6aeea21a 100644
--- a/mkspecs/features/functions.prf
+++ b/mkspecs/features/functions.prf
@@ -131,7 +131,7 @@ defineReplace(pkgConfigHostExecutable) {
 }
 
 defineTest(hasX11Dependencies) {
-    for(package, $$list("libdrm xcomposite xcursor xi xrandr xtst")) {
+    for(package, $$list("libdrm xcomposite xcursor xi xtst")) {
         !qtConfig(webengine-system-$$package) {
             return(false)
         }