Merge remote-tracking branch 'origin/5.7' into 5.8

Conflicts:
	src/3rdparty
	src/core/delegated_frame_node.h
	src/webengine/api/qquickwebenginecontextmenudata.cpp

Change-Id: I163488d0d32cd981351608b2886f12e547e24672

1 files changed, 5 insertions, 1 deletions

diff --git a/tests/auto/quick/qmltests/data/tst_scrollPosition.qml b/tests/auto/quick/qmltests/data/tst_scrollPosition.qml
index 08bb0f3b4..55b71189d 100644
--- a/tests/auto/quick/qmltests/data/tst_scrollPosition.qml
+++ b/tests/auto/quick/qmltests/data/tst_scrollPosition.qml
@@ -69,7 +69,11 @@ TestWebEngineView {
             tryCompare(webEngineView.scrollPosition, "y", 0);
 
             keyPress(Qt.Key_Return); // Focus is on the scroll button.
-            scrollPositionSpy.wait();
+
+            // Wait for proper scroll position change otherwise we cannot expect
+            // the new y position after reload.
+            tryCompare(webEngineView.scrollPosition, "x", 0);
+            tryCompare(webEngineView.scrollPosition, "y", 600);
 
             webEngineView.reload();
             verify(webEngineView.waitForLoadSucceeded());