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

Conflicts:
	examples/webenginewidgets/printme/printhandler.cpp
	src/3rdparty
	src/core/api/qwebenginepage_p.h
	src/core/content_browser_client_qt.h
	src/core/web_contents_adapter_client.h
	src/core/web_contents_delegate_qt.cpp
	src/core/web_contents_delegate_qt.h
	src/webenginequick/api/qquickwebengineview_p_p.h
	tests/auto/quick/qmltests/data/tst_download.qml
	tests/auto/quick/qmltests/data/tst_viewSoure.qml
	tests/auto/widgets/loadsignals/tst_loadsignals.cpp
	tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp

Change-Id: I9c1819ec15e13d4f8e244defe860e26274b5d4be

1 files changed, 7 insertions, 7 deletions

diff --git a/tests/auto/quick/qmltests/data/tst_favicon.qml b/tests/auto/quick/qmltests/data/tst_favicon.qml
index 92c50876c..fc8b90542 100644
--- a/tests/auto/quick/qmltests/data/tst_favicon.qml
+++ b/tests/auto/quick/qmltests/data/tst_favicon.qml
@@ -59,16 +59,16 @@ TestWebEngineView {
     function getFaviconPixel(faviconImage) {
         var grabImage = Qt.createQmlObject("
                 import QtQuick 2.5\n
-                Image { }", test)
+                Image { }", testCase)
         var faviconCanvas = Qt.createQmlObject("
                 import QtQuick 2.5\n
-                Canvas { }", test)
+                Canvas { }", testCase)
 
-        test.tryVerify(function() { return faviconImage.status == Image.Ready });
+        testCase.tryVerify(function() { return faviconImage.status == Image.Ready });
         faviconImage.grabToImage(function(result) {
                 grabImage.source = result.url
             });
-        test.tryVerify(function() { return grabImage.status == Image.Ready });
+        testCase.tryVerify(function() { return grabImage.status == Image.Ready });
 
         faviconCanvas.width = faviconImage.width;
         faviconCanvas.height = faviconImage.height;
@@ -97,7 +97,7 @@ TestWebEngineView {
     }
 
     TestCase {
-        id: test
+        id: testCase
         name: "WebEngineFavicon"
         when: windowShown
 
@@ -315,7 +315,7 @@ TestWebEngineView {
         function test_faviconProvider(row) {
             var faviconImage = Qt.createQmlObject("
                     import QtQuick 2.5\n
-                    Image { sourceSize: Qt.size(width, height) }", test)
+                    Image { sourceSize: Qt.size(width, height) }", testCase)
 
             compare(iconChangedSpy.count, 0)
 
@@ -338,7 +338,7 @@ TestWebEngineView {
         function test_dynamicFavicon() {
             var faviconImage = Qt.createQmlObject("
                     import QtQuick 2.5\n
-                    Image { width: 16; height: 16; sourceSize: Qt.size(width, height); }", test)
+                    Image { width: 16; height: 16; sourceSize: Qt.size(width, height); }", testCase)
             faviconImage.source = Qt.binding(function() { return webEngineView.icon; });
 
             var colors = [