diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2016-09-21 15:38:47 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2016-10-01 06:22:59 +0000 |
| commit | 2ec47c9921a1e381943159f540b45c105d2ff1db (patch) | |
| tree | 0566c9f3b94d6f869514dd363546c88518eb595e /src/webengine/api/qquickwebengineview.cpp | |
| parent | 18f386eaf30708580875a7841f138bcc197cc700 (diff) | |
| download | qtwebengine-2ec47c9921a1e381943159f540b45c105d2ff1db.tar.gz | |
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>
Diffstat (limited to 'src/webengine/api/qquickwebengineview.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 19 |
1 files changed, 5 insertions, 14 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(); } |