summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzabolcs David <davidsz@inf.u-szeged.hu>2018-11-14 13:46:18 +0100
committerSzabolcs David <davidsz@inf.u-szeged.hu>2018-11-28 13:08:21 +0000
commitce7d46d6122c0af2c5820d51bbb804bc81cdefa7 (patch)
tree21130f20b5800d04f243e37bba02d6a36a032e51
parentba816f1f5cd5ddb7f5cba32d0c9816bb439dffba (diff)
downloadqtwebengine-ce7d46d6122c0af2c5820d51bbb804bc81cdefa7.tar.gz
Docs: Extend documentation of WebActions
Add some useful information. Change-Id: I39290c8dfc6c4a1d87c6b24fe6c48cab93f805db Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--src/webengine/api/qquickwebengineaction.cpp3
-rw-r--r--src/webengine/doc/src/webengineview_lgpl.qdoc13
-rw-r--r--src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc32
3 files changed, 31 insertions, 17 deletions
diff --git a/src/webengine/api/qquickwebengineaction.cpp b/src/webengine/api/qquickwebengineaction.cpp
index 16eef04d3..f5b780ea6 100644
--- a/src/webengine/api/qquickwebengineaction.cpp
+++ b/src/webengine/api/qquickwebengineaction.cpp
@@ -146,7 +146,8 @@ QString QQuickWebEngineAction::iconName() const
/*!
\qmlproperty bool WebEngineAction::enabled
- This property holds whether the action is enabled.
+ This property holds whether the action is enabled. Context-dependent
+ actions are always enabled.
*/
bool QQuickWebEngineAction::isEnabled() const
{
diff --git a/src/webengine/doc/src/webengineview_lgpl.qdoc b/src/webengine/doc/src/webengineview_lgpl.qdoc
index 87094c266..0e25e16f3 100644
--- a/src/webengine/doc/src/webengineview_lgpl.qdoc
+++ b/src/webengine/doc/src/webengineview_lgpl.qdoc
@@ -754,9 +754,11 @@
\value WebEngineView.OpenLinkInThisWindow
Open the current link in the current window. (Added in Qt 5.6)
\value WebEngineView.OpenLinkInNewWindow
- Open the current link in a new window. (Added in Qt 5.6)
+ Open the current link in a new window. Requires a handler for the
+ \l newViewRequested() signal. (Added in Qt 5.6)
\value WebEngineView.OpenLinkInNewTab
- Open the current link in a new tab. (Added in Qt 5.6)
+ Open the current link in a new tab. Requires a handler for the
+ \l newViewRequested() signal. (Added in Qt 5.6)
\value WebEngineView.CopyLinkToClipboard
Copy the current link to the clipboard. (Added in Qt 5.6)
\value WebEngineView.CopyImageToClipboard
@@ -777,8 +779,8 @@
Mute or unmute the hovered audio or video element. (Added in Qt 5.6)
\value WebEngineView.DownloadLinkToDisk
Download the current link to the disk. To implement download
- actions, connect to the QWebEngineProfile::downloadRequested signal.
- (Added in Qt 5.6)
+ actions, connect to the \l {QQuickWebEngineProfile::downloadRequested}
+ {WebEngineProfile.downloadRequested} signal. (Added in Qt 5.6)
\value WebEngineView.DownloadImageToDisk
Download the highlighted image to the disk. (Added in Qt 5.6)
\value WebEngineView.DownloadMediaToDisk
@@ -791,7 +793,8 @@
\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)
+ Show the source of the current page in a new tab. Requires a handler for the
+ \l newViewRequested() signal. (Added in Qt 5.8)
\value WebEngineView.ToggleBold
Toggles boldness for the selection or at the cursor position.
diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
index f91b71ea1..d012c678c 100644
--- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
@@ -109,9 +109,11 @@
This enum describes the types of action which can be performed on the web page.
- Actions only have an effect when they are applicable. The availability of
- actions can be be determined by checking \l{QAction::}{isEnabled()} on the
- action returned by action().
+ Actions only have an effect when they are applicable.
+
+ The availability of actions can be be determined by checking
+ \l{QAction::}{isEnabled()} on the action returned by action(). Context-dependent
+ actions are always enabled.
\value NoWebAction No action is triggered.
\value Back Navigate back in the history of navigated links.
@@ -128,9 +130,12 @@
\value PasteAndMatchStyle Paste content from the clipboard with current style.
\value OpenLinkInThisWindow Open the current link in the current window. (Added in Qt 5.6)
- \value OpenLinkInNewWindow Open the current link in a new window. (Added in Qt 5.6)
- \value OpenLinkInNewTab Open the current link in a new tab. (Added in Qt 5.6)
- \value OpenLinkInNewBackgroundTab Open the current link in a new background tab. (Added in Qt 5.7)
+ \value OpenLinkInNewWindow Open the current link in a new window. Requires implementation of
+ \l createWindow(). (Added in Qt 5.6)
+ \value OpenLinkInNewTab Open the current link in a new tab. Requires implementation of
+ \l createWindow(). (Added in Qt 5.6)
+ \value OpenLinkInNewBackgroundTab Open the current link in a new background tab. Requires
+ implementation of \l createWindow(). (Added in Qt 5.7)
\value CopyLinkToClipboard Copy the current link to the clipboard. (Added in Qt 5.6)
\value CopyImageToClipboard Copy the clicked image to the clipboard. (Added in Qt 5.6)
@@ -143,9 +148,12 @@
\value ToggleMediaPlayPause Toggle the play/pause state of the hovered audio or video element.
(Added in Qt 5.6)
\value ToggleMediaMute Mute or unmute the hovered audio or video element. (Added in Qt 5.6)
- \value DownloadLinkToDisk Download the current link to the disk. (Added in Qt 5.6)
- \value DownloadImageToDisk Download the highlighted image to the disk. (Added in Qt 5.6)
- \value DownloadMediaToDisk Download the hovered audio or video to the disk. (Added in Qt 5.6)
+ \value DownloadLinkToDisk Download the current link to the disk. Requires a slot for
+ \l{QWebEngineProfile::}{downloadRequested()}. (Added in Qt 5.6)
+ \value DownloadImageToDisk Download the highlighted image to the disk. Requires a slot for
+ \l{QWebEngineProfile::}{downloadRequested()}. (Added in Qt 5.6)
+ \value DownloadMediaToDisk Download the hovered audio or video to the disk. Requires a slot for
+ \l{QWebEngineProfile::}{downloadRequested()}. (Added in Qt 5.6)
\value InspectElement Trigger any attached Web Inspector to inspect the highlighed element.
(Added in Qt 5.6)
@@ -155,8 +163,10 @@
request is confirmed, \c windowCloseRequested is emitted. (Added in Qt 5.6)
\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 Show the source of the current page in a new tab. (Added in Qt 5.8)
+ the web page on disk. Requires a slot for \l{QWebEngineProfile::}{downloadRequested()}.
+ (Added in Qt 5.7)
+ \value ViewSource Show the source of the current page in a new tab. Requires implementation of
+ \l createWindow(). (Added in Qt 5.8)
\value ToggleBold
Toggles boldness for the selection or at the cursor position.