Remove viewSource and canViewSource APIs and use WebAction instead

Task-number: QTBUG-56092
Change-Id: I026a0d153269a71e4e44f0fd30ef5ca054edd0e7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

4 files changed, 9 insertions, 36 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 1fdab6a52..64f7fb5be 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -255,8 +255,8 @@ bool QQuickWebEngineViewPrivate::contextMenuRequested(const WebEngineContextMenu
         ui()->addMenuItem(item, QQuickWebEngineView::tr("Reload"), QStringLiteral("view-refresh"));
 
         item = new MenuItemHandler(menu);
-        QObject::connect(item, &MenuItemHandler::triggered, q, &QQuickWebEngineView::viewSource);
-        ui()->addMenuItem(item, QQuickWebEngineView::tr("View Page Source"), QStringLiteral("view-source"), q->canViewSource());
+        QObject::connect(item, &MenuItemHandler::triggered, [q] { q->triggerWebAction(QQuickWebEngineView::ViewSource); });
+        ui()->addMenuItem(item, QQuickWebEngineView::tr("View Page Source"), QStringLiteral("view-source"), adapter->canViewSource());
     } else {
         item = new MenuItemHandler(menu);
         QObject::connect(item, &MenuItemHandler::triggered, [q] { q->triggerWebAction(QQuickWebEngineView::Copy); });
@@ -1328,18 +1328,6 @@ void QQuickWebEngineView::replaceMisspelledWord(const QString &replacement)
     d->adapter->replaceMisspelling(replacement);
 }
 
-void QQuickWebEngineView::viewSource()
-{
-    Q_D(QQuickWebEngineView);
-    d->adapter->viewSource();
-}
-
-bool QQuickWebEngineView::canViewSource() const
-{
-    Q_D(const QQuickWebEngineView);
-    return d->adapter->canViewSource();
-}
-
 bool QQuickWebEngineView::isFullScreen() const
 {
     Q_D(const QQuickWebEngineView);
@@ -1689,6 +1677,9 @@ void QQuickWebEngineView::triggerWebAction(WebAction action)
     case SavePage:
         d->adapter->save();
         break;
+    case ViewSource:
+        d->adapter->viewSource();
+        break;
     default:
         Q_UNREACHABLE();
     }
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index 64894d88d..16c4799b5 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -123,7 +123,6 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem {
     Q_PROPERTY(bool audioMuted READ isAudioMuted WRITE setAudioMuted NOTIFY audioMutedChanged FINAL REVISION 3)
     Q_PROPERTY(bool recentlyAudible READ recentlyAudible NOTIFY recentlyAudibleChanged FINAL REVISION 3)
     Q_PROPERTY(uint webChannelWorld READ webChannelWorld WRITE setWebChannelWorld NOTIFY webChannelWorldChanged REVISION 3)
-    Q_PROPERTY(bool canViewSource READ canViewSource FINAL REVISION 4)
 
 #ifdef ENABLE_QML_TESTSUPPORT_API
     Q_PROPERTY(QQuickWebEngineTestSupport *testSupport READ testSupport WRITE setTestSupport FINAL)
@@ -150,7 +149,6 @@ public:
     void setBackgroundColor(const QColor &color);
     QSizeF contentsSize() const;
     QPointF scrollPosition() const;
-    bool canViewSource() const;
 
     // must match WebContentsAdapterClient::NavigationRequestAction
     enum NavigationRequestAction {
@@ -247,6 +245,7 @@ public:
         RequestClose,
         Unselect,
         SavePage,
+        ViewSource,
         WebActionCount
     };
     Q_ENUM(WebAction)
@@ -477,7 +476,6 @@ public Q_SLOTS:
     Q_REVISION(3) void printToPdf(const QString &filePath, PrintedPageSizeId pageSizeId = PrintedPageSizeId::A4, PrintedPageOrientation orientation = PrintedPageOrientation::Portrait);
     Q_REVISION(3) void printToPdf(const QJSValue &callback, PrintedPageSizeId pageSizeId = PrintedPageSizeId::A4, PrintedPageOrientation orientation = PrintedPageOrientation::Portrait);
     Q_REVISION(4) void replaceMisspelledWord(const QString &replacement);
-    Q_REVISION(4) void viewSource();
 
 private Q_SLOTS:
     void lazyInitialize();
diff --git a/src/webengine/doc/src/qtwebengine-features.qdoc b/src/webengine/doc/src/qtwebengine-features.qdoc
index 48f1536b4..5ba3f23b8 100644
--- a/src/webengine/doc/src/qtwebengine-features.qdoc
+++ b/src/webengine/doc/src/qtwebengine-features.qdoc
@@ -306,8 +306,7 @@
     Qt WebEngine supports viewing the HTML source of a web page.
 
     This feature can be used from custom menus or assigned to custom events.
-    For more information, see WebEngineView::viewSource, WebEngineView::canViewSource,
-    QWebEnginePage::viewSource, and QWebEnginePage::canViewSource.
+    For more information, see WebEngineView::WebAction, and QWebEnginePage::WebAction.
 
     This feature can be tested by opening a web page in \l{WebEngine Widgets
     Simple Browser Example}{Simple Browser} or \l{WebEngine Quick Nano Browser}
diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc
index 82fd66989..512f6dfda 100644
--- a/src/webengine/doc/src/webengineview.qdoc
+++ b/src/webengine/doc/src/webengineview.qdoc
@@ -806,6 +806,8 @@
             Exit the fullscreen mode. (Added in Qt 5.6)
     \value  WebEngineView.SavePage
             Save the current web page to disk. (Added in Qt 5.7)
+    \value  WebEngineView.ViewSource
+            Show the source of the current page in a new tab. (Added in Qt 5.8)
 
     \omitvalue WebActionCount
 */
@@ -1145,23 +1147,6 @@
 */
 
 /*!
-    \qmlmethod void WebEngineView::viewSource()
-    \since QtWebEngine 1.4
-
-    Shows the source of the current page in a new tab.
-
-    \sa canViewSource
-*/
-
-/*!
-    \qmlproperty bool WebEngineView::canViewSource
-    \brief This property holds whether the source for the current page can be viewed.
-    \since QtWebEngine 1.4
-
-    \sa viewSource()
-*/
-
-/*!
     \qmlsignal WebEngineView::authenticationDialogRequested(AuthenticationDialogRequest request)
     \since QtWebEngine 1.4