From ae74f9f488e32ba60ee58718c90ea911565776d7 Mon Sep 17 00:00:00 2001
From: Balazs Egedi <egedib@inf.u-szeged.hu>
Date: Thu, 30 Sep 2021 16:22:57 +0200
Subject: Fix warnings in QML tests regarding parameter injection

Parameter "param" is not declared. Injection of parameters into
signal handlers is deprecated. Use JavaScript functions with formal
parameters instead.

Pick-to: 6.2
Change-Id: Iea3583feb10fc56424ebb070e9b19e605c252773
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 tests/auto/quick/qmltests/data/tst_desktopBehaviorLoadHtml.qml    | 2 +-
 tests/auto/quick/qmltests/data/tst_geopermission.qml              | 2 +-
 tests/auto/quick/qmltests/data/tst_getUserMedia.qml               | 2 +-
 tests/auto/quick/qmltests/data/tst_notification.qml               | 2 +-
 .../auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml | 8 ++++++--
 tests/auto/quick/qmltests/data/tst_userScripts.qml                | 2 +-
 tests/auto/quick/qmltests/data/tst_viewSource.qml                 | 2 +-
 7 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/quick/qmltests/data/tst_desktopBehaviorLoadHtml.qml b/tests/auto/quick/qmltests/data/tst_desktopBehaviorLoadHtml.qml
index cac56d88f..8ab9925dd 100644
--- a/tests/auto/quick/qmltests/data/tst_desktopBehaviorLoadHtml.qml
+++ b/tests/auto/quick/qmltests/data/tst_desktopBehaviorLoadHtml.qml
@@ -44,7 +44,7 @@ TestWebEngineView {
         signalName: "linkHovered"
     }
 
-    onLinkHovered: {
+    onLinkHovered: function(hoveredUrl) {
         webEngineView.lastUrl = hoveredUrl
     }
 
diff --git a/tests/auto/quick/qmltests/data/tst_geopermission.qml b/tests/auto/quick/qmltests/data/tst_geopermission.qml
index 87272dc45..d16e94d8d 100644
--- a/tests/auto/quick/qmltests/data/tst_geopermission.qml
+++ b/tests/auto/quick/qmltests/data/tst_geopermission.qml
@@ -44,7 +44,7 @@ TestWebEngineView {
         signalName: "featurePermissionRequested"
     }
 
-    onFeaturePermissionRequested: {
+    onFeaturePermissionRequested: function(securityOrigin, feature) {
         if (feature === WebEngineView.Geolocation) {
             geoPermissionRequested = true
             if (deniedGeolocation) {
diff --git a/tests/auto/quick/qmltests/data/tst_getUserMedia.qml b/tests/auto/quick/qmltests/data/tst_getUserMedia.qml
index ac9e0f7f2..fe2d91011 100644
--- a/tests/auto/quick/qmltests/data/tst_getUserMedia.qml
+++ b/tests/auto/quick/qmltests/data/tst_getUserMedia.qml
@@ -143,7 +143,7 @@ TestWebEngineView {
     property variant requestedFeature
     property variant requestedSecurityOrigin
 
-    onFeaturePermissionRequested: {
+    onFeaturePermissionRequested: function(securityOrigin, feature) {
         requestedFeature = feature
         requestedSecurityOrigin = securityOrigin
     }
diff --git a/tests/auto/quick/qmltests/data/tst_notification.qml b/tests/auto/quick/qmltests/data/tst_notification.qml
index 802c75f7c..46a21ff4d 100644
--- a/tests/auto/quick/qmltests/data/tst_notification.qml
+++ b/tests/auto/quick/qmltests/data/tst_notification.qml
@@ -48,7 +48,7 @@ TestWebEngineView {
         signalName: 'featurePermissionRequested'
     }
 
-    onFeaturePermissionRequested: {
+    onFeaturePermissionRequested: function(securityOrigin, feature) {
         if (feature === WebEngineView.Notifications) {
             view.permissionRequested = true
             view.securityOrigin = securityOrigin
diff --git a/tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml b/tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml
index d1738852d..c84d5da2b 100644
--- a/tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml
+++ b/tests/auto/quick/qmltests/data/tst_unhandledKeyEventPropagation.qml
@@ -37,8 +37,12 @@ Item {
 
     property var pressEvents: []
     property var releaseEvents: []
-    Keys.onPressed: pressEvents.push(event.key)
-    Keys.onReleased: releaseEvents.push(event.key)
+    Keys.onPressed: function(event) {
+        pressEvents.push(event.key)
+    }
+    Keys.onReleased: function(event) {
+        releaseEvents.push(event.key)
+    }
 
     TestWebEngineView {
         id: webEngineView
diff --git a/tests/auto/quick/qmltests/data/tst_userScripts.qml b/tests/auto/quick/qmltests/data/tst_userScripts.qml
index 82aae32a8..0f1042f80 100644
--- a/tests/auto/quick/qmltests/data/tst_userScripts.qml
+++ b/tests/auto/quick/qmltests/data/tst_userScripts.qml
@@ -77,7 +77,7 @@ Item {
         width: 400
         height: 300
 
-        onNavigationRequested: {
+        onNavigationRequested: function(request) {
             var urlString = request.url.toString();
             if (urlString.indexOf("test1.html") !== -1)
                 userScripts.collection = [ changeDocumentTitleScript() ];
diff --git a/tests/auto/quick/qmltests/data/tst_viewSource.qml b/tests/auto/quick/qmltests/data/tst_viewSource.qml
index 38d163d0c..d6377cdad 100644
--- a/tests/auto/quick/qmltests/data/tst_viewSource.qml
+++ b/tests/auto/quick/qmltests/data/tst_viewSource.qml
@@ -55,7 +55,7 @@ TestWebEngineView {
         signalName: "titleChanged"
     }
 
-    onNewWindowRequested: {
+    onNewWindowRequested: function(request) {
         viewRequest = {
             "destination": request.destination,
             "userInitiated": request.userInitiated
-- 
cgit v1.2.3