Clean up WebEngineAction API

- Rename iconText to iconName
- Remove unused QQuickWebEngineAction::toggled signal
- Remove argument of QQuickWebEngineAction::enabledChanged signal

Change-Id: I37172c096003eea58e567753265abd91679dacf1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 46 insertions, 47 deletions

diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index d8c1bd80c..0e48e280d 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -96,11 +96,10 @@ static const QStringList hardcodedTypes = QStringList()
 
 static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineAction.text --> QString"
-    << "QQuickWebEngineAction.iconText --> QString"
+    << "QQuickWebEngineAction.iconName --> QString"
     << "QQuickWebEngineAction.enabled --> bool"
-    << "QQuickWebEngineAction.toggled() --> void"
     << "QQuickWebEngineAction.triggered() --> void"
-    << "QQuickWebEngineAction.enabledChanged(bool) --> void"
+    << "QQuickWebEngineAction.enabledChanged() --> void"
     << "QQuickWebEngineAction.trigger() --> void"
     << "QQuickWebEngineAuthenticationDialogRequest.AuthenticationTypeHTTP --> AuthenticationType"
     << "QQuickWebEngineAuthenticationDialogRequest.AuthenticationTypeProxy --> AuthenticationType"
diff --git a/tests/auto/quick/qmltests/data/tst_action.qml b/tests/auto/quick/qmltests/data/tst_action.qml
index b27e7d821..f6d8669fe 100644
--- a/tests/auto/quick/qmltests/data/tst_action.qml
+++ b/tests/auto/quick/qmltests/data/tst_action.qml
@@ -47,50 +47,50 @@ TestWebEngineView {
 
         function test_actions_data() {
             return [
-                   { webAction: WebEngineView.Back, text: "Back", iconText: "go-previous", enabled: false },
-                   { webAction: WebEngineView.Forward, text: "Forward", iconText: "go-next", enabled: false },
-                   { webAction: WebEngineView.Stop, text: "Stop", iconText: "", enabled: false },
-                   { webAction: WebEngineView.Reload, text: "Reload", iconText: "view-refresh", enabled: true },
-                   { webAction: WebEngineView.Cut, text: "Cut", iconText: "Cut", enabled: true },
-                   { webAction: WebEngineView.Copy, text: "Copy", iconText: "", enabled: true },
-                   { webAction: WebEngineView.Paste, text: "Paste", iconText: "", enabled: true },
-                   { webAction: WebEngineView.Undo, text: "Undo", iconText: "", enabled: true },
-                   { webAction: WebEngineView.Redo, text: "Redo", iconText: "", enabled: true },
-                   { webAction: WebEngineView.SelectAll, text: "Select all", iconText: "", enabled: true },
-                   { webAction: WebEngineView.ReloadAndBypassCache, text: "Reload and Bypass Cache", iconText: "", enabled: true },
-                   { webAction: WebEngineView.PasteAndMatchStyle, text: "Paste and match style", iconText: "", enabled: true },
-                   { webAction: WebEngineView.OpenLinkInThisWindow, text: "Open link in this window", iconText: "", enabled: true },
-                   { webAction: WebEngineView.OpenLinkInNewWindow, text: "Open link in new window", iconText: "", enabled: true },
-                   { webAction: WebEngineView.OpenLinkInNewTab, text: "Open link in new tab", iconText: "", enabled: true },
-                   { webAction: WebEngineView.CopyLinkToClipboard, text: "Copy link address", iconText: "", enabled: true },
-                   { webAction: WebEngineView.DownloadLinkToDisk, text: "Save link", iconText: "", enabled: true },
-                   { webAction: WebEngineView.CopyImageToClipboard, text: "Copy image", iconText: "", enabled: true },
-                   { webAction: WebEngineView.CopyImageUrlToClipboard, text: "Copy image address", iconText: "", enabled: true },
-                   { webAction: WebEngineView.DownloadImageToDisk, text: "Save image", iconText: "", enabled: true },
-                   { webAction: WebEngineView.CopyMediaUrlToClipboard, text: "Copy media address", iconText: "", enabled: true },
-                   { webAction: WebEngineView.ToggleMediaControls, text: "Show controls", iconText: "", enabled: true },
-                   { webAction: WebEngineView.ToggleMediaLoop, text: "Loop", iconText: "", enabled: true },
-                   { webAction: WebEngineView.ToggleMediaPlayPause, text: "Toggle Play/Pause", iconText: "", enabled: true },
-                   { webAction: WebEngineView.ToggleMediaMute, text: "Toggle Mute", iconText: "", enabled: true },
-                   { webAction: WebEngineView.DownloadMediaToDisk, text: "Save media", iconText: "", enabled: true },
-                   { webAction: WebEngineView.InspectElement, text: "Inspect", iconText: "", enabled: true },
-                   { webAction: WebEngineView.ExitFullScreen, text: "Exit full screen", iconText: "", enabled: true },
-                   { webAction: WebEngineView.RequestClose, text: "Close Page", iconText: "", enabled: true },
-                   { webAction: WebEngineView.Unselect, text: "Unselect", iconText: "", enabled: true },
-                   { webAction: WebEngineView.SavePage, text: "Save page", iconText: "", enabled: true },
-                   { webAction: WebEngineView.ViewSource, text: "View page source", iconText: "view-source", enabled: true },
-                   { webAction: WebEngineView.ToggleBold, text: "&Bold", iconText: "", enabled: true },
-                   { webAction: WebEngineView.ToggleItalic, text: "&Italic", iconText: "", enabled: true },
-                   { webAction: WebEngineView.ToggleUnderline, text: "&Underline", iconText: "", enabled: true },
-                   { webAction: WebEngineView.ToggleStrikethrough, text: "&Strikethrough", iconText: "", enabled: true },
-                   { webAction: WebEngineView.AlignLeft, text: "Align &Left", iconText: "", enabled: true },
-                   { webAction: WebEngineView.AlignCenter, text: "Align &Center", iconText: "", enabled: true },
-                   { webAction: WebEngineView.AlignRight, text: "Align &Right", iconText: "", enabled: true },
-                   { webAction: WebEngineView.AlignJustified, text: "Align &Justified", iconText: "", enabled: true },
-                   { webAction: WebEngineView.Indent, text: "&Indent", iconText: "", enabled: true },
-                   { webAction: WebEngineView.Outdent, text: "&Outdent", iconText: "", enabled: true },
-                   { webAction: WebEngineView.InsertOrderedList, text: "Insert &Ordered List", iconText: "", enabled: true },
-                   { webAction: WebEngineView.InsertUnorderedList, text: "Insert &Unordered List", iconText: "", enabled: true }
+                   { webAction: WebEngineView.Back, text: "Back", iconName: "go-previous", enabled: false },
+                   { webAction: WebEngineView.Forward, text: "Forward", iconName: "go-next", enabled: false },
+                   { webAction: WebEngineView.Stop, text: "Stop", iconName: "", enabled: false },
+                   { webAction: WebEngineView.Reload, text: "Reload", iconName: "view-refresh", enabled: true },
+                   { webAction: WebEngineView.Cut, text: "Cut", iconName: "Cut", enabled: true },
+                   { webAction: WebEngineView.Copy, text: "Copy", iconName: "", enabled: true },
+                   { webAction: WebEngineView.Paste, text: "Paste", iconName: "", enabled: true },
+                   { webAction: WebEngineView.Undo, text: "Undo", iconName: "", enabled: true },
+                   { webAction: WebEngineView.Redo, text: "Redo", iconName: "", enabled: true },
+                   { webAction: WebEngineView.SelectAll, text: "Select all", iconName: "", enabled: true },
+                   { webAction: WebEngineView.ReloadAndBypassCache, text: "Reload and Bypass Cache", iconName: "", enabled: true },
+                   { webAction: WebEngineView.PasteAndMatchStyle, text: "Paste and match style", iconName: "", enabled: true },
+                   { webAction: WebEngineView.OpenLinkInThisWindow, text: "Open link in this window", iconName: "", enabled: true },
+                   { webAction: WebEngineView.OpenLinkInNewWindow, text: "Open link in new window", iconName: "", enabled: true },
+                   { webAction: WebEngineView.OpenLinkInNewTab, text: "Open link in new tab", iconName: "", enabled: true },
+                   { webAction: WebEngineView.CopyLinkToClipboard, text: "Copy link address", iconName: "", enabled: true },
+                   { webAction: WebEngineView.DownloadLinkToDisk, text: "Save link", iconName: "", enabled: true },
+                   { webAction: WebEngineView.CopyImageToClipboard, text: "Copy image", iconName: "", enabled: true },
+                   { webAction: WebEngineView.CopyImageUrlToClipboard, text: "Copy image address", iconName: "", enabled: true },
+                   { webAction: WebEngineView.DownloadImageToDisk, text: "Save image", iconName: "", enabled: true },
+                   { webAction: WebEngineView.CopyMediaUrlToClipboard, text: "Copy media address", iconName: "", enabled: true },
+                   { webAction: WebEngineView.ToggleMediaControls, text: "Show controls", iconName: "", enabled: true },
+                   { webAction: WebEngineView.ToggleMediaLoop, text: "Loop", iconName: "", enabled: true },
+                   { webAction: WebEngineView.ToggleMediaPlayPause, text: "Toggle Play/Pause", iconName: "", enabled: true },
+                   { webAction: WebEngineView.ToggleMediaMute, text: "Toggle Mute", iconName: "", enabled: true },
+                   { webAction: WebEngineView.DownloadMediaToDisk, text: "Save media", iconName: "", enabled: true },
+                   { webAction: WebEngineView.InspectElement, text: "Inspect", iconName: "", enabled: true },
+                   { webAction: WebEngineView.ExitFullScreen, text: "Exit full screen", iconName: "", enabled: true },
+                   { webAction: WebEngineView.RequestClose, text: "Close Page", iconName: "", enabled: true },
+                   { webAction: WebEngineView.Unselect, text: "Unselect", iconName: "", enabled: true },
+                   { webAction: WebEngineView.SavePage, text: "Save page", iconName: "", enabled: true },
+                   { webAction: WebEngineView.ViewSource, text: "View page source", iconName: "view-source", enabled: true },
+                   { webAction: WebEngineView.ToggleBold, text: "&Bold", iconName: "", enabled: true },
+                   { webAction: WebEngineView.ToggleItalic, text: "&Italic", iconName: "", enabled: true },
+                   { webAction: WebEngineView.ToggleUnderline, text: "&Underline", iconName: "", enabled: true },
+                   { webAction: WebEngineView.ToggleStrikethrough, text: "&Strikethrough", iconName: "", enabled: true },
+                   { webAction: WebEngineView.AlignLeft, text: "Align &Left", iconName: "", enabled: true },
+                   { webAction: WebEngineView.AlignCenter, text: "Align &Center", iconName: "", enabled: true },
+                   { webAction: WebEngineView.AlignRight, text: "Align &Right", iconName: "", enabled: true },
+                   { webAction: WebEngineView.AlignJustified, text: "Align &Justified", iconName: "", enabled: true },
+                   { webAction: WebEngineView.Indent, text: "&Indent", iconName: "", enabled: true },
+                   { webAction: WebEngineView.Outdent, text: "&Outdent", iconName: "", enabled: true },
+                   { webAction: WebEngineView.InsertOrderedList, text: "Insert &Ordered List", iconName: "", enabled: true },
+                   { webAction: WebEngineView.InsertUnorderedList, text: "Insert &Unordered List", iconName: "", enabled: true }
             ];
         }