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

Conflicts:
    .qmake.conf
    tests/auto/quick/qmltests/BLACKLIST
    tests/auto/quick/qquickwebengineview/BLACKLIST

Change-Id: I29b68dec8692d0369a2dda56350ee62d3ad73e08

3 files changed, 1 insertions, 22 deletions

diff --git a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
index 8e23e86e8..922c7769e 100644
--- a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
+++ b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
@@ -167,7 +167,7 @@ void tst_InspectorServer::openRemoteDebuggingSession()
     // - The page list didn't return a valid inspector URL
     // - Or the front-end couldn't be loaded through the inspector HTTP server
     // - Or the web socket connection couldn't be established between the front-end and the page through the inspector server
-    QTRY_VERIFY(inspectorWebView->title().startsWith("DevTools -"));
+    QTRY_VERIFY_WITH_TIMEOUT(inspectorWebView->title().startsWith("DevTools -"), 20000);
 }
 
 QTEST_MAIN(tst_InspectorServer)
diff --git a/tests/auto/quick/qmltests/BLACKLIST b/tests/auto/quick/qmltests/BLACKLIST
index 957911c3b..46bc65923 100644
--- a/tests/auto/quick/qmltests/BLACKLIST
+++ b/tests/auto/quick/qmltests/BLACKLIST
@@ -1,11 +1,2 @@
-[WebViewGeopermission::test_deniedGeolocationByUser]
-osx
-
-[WebViewGeopermission::test_geoPermissionRequest]
-osx
-
-[WebViewFindText::test_findTextInterruptedByLoad]
-*
-
 [WebEngineViewSource::test_viewSourceURL]
 *
diff --git a/tests/auto/quick/qquickwebengineview/BLACKLIST b/tests/auto/quick/qquickwebengineview/BLACKLIST
index 166a6894e..49c5332ff 100644
--- a/tests/auto/quick/qquickwebengineview/BLACKLIST
+++ b/tests/auto/quick/qquickwebengineview/BLACKLIST
@@ -1,15 +1,3 @@
-[transparentWebEngineViews]
-windows
-
-[inputEventForwardingDisabledWhenActiveFocusOnPressDisabled]
-*
-
-[transparentWebEngineViews]
-*
-
-[basicRenderingSanity]
-*
-
 [javascriptClipboard:default]
 opensuse-leap