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/webenginewidgets | |
| parent | 18f386eaf30708580875a7841f138bcc197cc700 (diff) | |
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/webenginewidgets')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 25 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.h | 3 | ||||
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | 2 |
3 files changed, 1 insertions, 29 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 34784c507..1004b3e92 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -1889,31 +1889,6 @@ const QWebEngineContextMenuData &QWebEnginePage::contextMenuData() const return d->contextData; } -/*! - \since 5.8 - - Shows the source of the current page in a new tab. - - \sa canViewSource -*/ -void QWebEnginePage::viewSource() -{ - triggerAction(QWebEnginePage::ViewSource); -} - -/*! - \property QWebEnginePage::canViewSource - \brief whether the source for the current page can be viewed. - \since 5.8 - - \sa viewSource() -*/ -bool QWebEnginePage::canViewSource() const -{ - Q_D(const QWebEnginePage); - return d->adapter->canViewSource(); -} - QT_END_NAMESPACE #include "moc_qwebenginepage.cpp" diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h index d283f6aef..e85f9b30e 100644 --- a/src/webenginewidgets/api/qwebenginepage.h +++ b/src/webenginewidgets/api/qwebenginepage.h @@ -84,7 +84,6 @@ class QWEBENGINEWIDGETS_EXPORT QWebEnginePage : public QObject { Q_PROPERTY(QPointF scrollPosition READ scrollPosition NOTIFY scrollPositionChanged) Q_PROPERTY(bool audioMuted READ isAudioMuted WRITE setAudioMuted NOTIFY audioMutedChanged) Q_PROPERTY(bool recentlyAudible READ recentlyAudible NOTIFY recentlyAudibleChanged) - Q_PROPERTY(bool canViewSource READ canViewSource) public: enum WebAction { @@ -292,8 +291,6 @@ public: #endif // QT_NO_PRINTER const QWebEngineContextMenuData &contextMenuData() const; - void viewSource(); - bool canViewSource() const; Q_SIGNALS: void loadStarted(); diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index 560d4a2e4..58abc9fa1 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc @@ -156,7 +156,7 @@ \value Unselect Clear the current selection. (Added in Qt 5.7) \value SavePage Save the current page to disk. MHTML is the default format that is used to store the web page on disk. (Added in Qt 5.7) - \value ViewSource Shows the source of the current page in a new tab. (Added in Qt 5.8) + \value ViewSource Show the source of the current page in a new tab. (Added in Qt 5.8) \omitvalue WebActionCount |