summaryrefslogtreecommitdiffstats
path: root/src/webengine/doc/src/webengineview_lgpl.qdoc
diff options
context:
space:
mode:
Diffstat (limited to 'src/webengine/doc/src/webengineview_lgpl.qdoc')
-rw-r--r--src/webengine/doc/src/webengineview_lgpl.qdoc36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/webengine/doc/src/webengineview_lgpl.qdoc b/src/webengine/doc/src/webengineview_lgpl.qdoc
index 8f03774c8..6e349dfb3 100644
--- a/src/webengine/doc/src/webengineview_lgpl.qdoc
+++ b/src/webengine/doc/src/webengineview_lgpl.qdoc
@@ -396,7 +396,7 @@
runJavaScript("document.title", function(result) { console.log(result); });
\endcode
- Only "plain data" can be returned from JavaScript as the result value.
+ Only plain data can be returned from JavaScript as the result value.
Supported data types include all of the JSON data types as well as, for
example, \c{Date} and \c{ArrayBuffer}. Unsupported data types include, for
example, \c{Function} and \c{Promise}.
@@ -407,7 +407,8 @@
\warning Do not execute lengthy routines in the callback function, because it might block the
rendering of the web content.
- See WebEngineView::userScripts for an alternative API to inject scripts.
+ For more information about injecting scripts, see \l {Script Injection}.
+ For an alternative way to inject scripts, see WebEngineView::userScripts.
*/
/*!
@@ -444,14 +445,13 @@
To clear the search highlight, just pass an empty string.
- The \a resultCallback must take a boolean parameter. It will be called with
- a value of true if the \a subString was found; otherwise the callback value
- will be false.
+ The \a resultCallback must take an integer parameter. It will be called with
+ the number of found occurrences of the \a subString.
\code
- findText("Qt", WebEngineView.FindCaseSensitively, function(success) {
- if (success)
- console.log("Qt was found!");
+ findText("Qt", WebEngineView.FindCaseSensitively, function(matchCount) {
+ if (matchCount > 0)
+ console.log("'Qt' tokens found:", matchCount);
});
\endcode
@@ -1520,7 +1520,7 @@
\qmlsignal WebEngineView::tooltipRequested(TooltipRequest request)
\since QtWebEngine 1.10
- This signal is emitted when the web page wants to show a tooltip at
+ This signal is emitted when the web page sends a \a request to show a tooltip at
a specified position.
\note Signal handlers need to call \c{request.accepted = true} to prevent a default tooltip from showing up.
@@ -1530,7 +1530,7 @@
/*!
\qmlproperty enumeration WebEngineView::LifecycleState
- \since QtWebEngine 1.11
+ \since QtWebEngine 1.10
This enum describes the lifecycle state of the page:
@@ -1541,12 +1541,12 @@
\value WebEngineView.LifecycleState.Discarded
Very low resource usage state where the entire browsing context is discarded.
- \sa lifecycleState
+ \sa lifecycleState, {Page Lifecycle API}, {WebEngine Lifecycle Example}
*/
/*!
\qmlproperty LifecycleState WebEngineView::lifecycleState
- \since QtWebEngine 1.11
+ \since QtWebEngine 1.10
\brief The current lifecycle state of the page.
@@ -1563,12 +1563,12 @@
These are the only hard limits on the lifecycle state, but see also
\l{recommendedState} for the recommended soft limits.
- \sa recommendedState, {WebEngine Lifecycle Example}
+ \sa recommendedState, {Page Lifecycle API}, {WebEngine Lifecycle Example}
*/
/*!
\qmlproperty LifecycleState WebEngineView::recommendedState
- \since QtWebEngine 1.11
+ \since QtWebEngine 1.10
\brief The recommended limit for the lifecycle state of the page.
@@ -1577,14 +1577,14 @@
playback or loss of HTML form input. Setting the lifecycle state to a higher
resource state is however completely safe.
- \sa lifecycleState, {WebEngine Lifecycle Example}
+ \sa lifecycleState, {Page Lifecycle API}, {WebEngine Lifecycle Example}
*/
/*!
\qmltype FindTextResult
\instantiates QWebEngineFindTextResult
\inqmlmodule QtWebEngine
- \since QtWebEngine 1.11
+ \since QtWebEngine 1.10
\brief A utility type for encapsulating the result of a string search on a page.
@@ -1599,7 +1599,7 @@
*/
/*!
- \qmlproperty int FindTextResult::activeMatchOrdinal
+ \qmlproperty int FindTextResult::activeMatch
\readonly
\brief The index of the currently highlighted match.
@@ -1607,7 +1607,7 @@
/*!
\qmlsignal WebEngineView::findTextFinished(FindTextResult result)
- \since QtWebEngine 1.11
+ \since QtWebEngine 1.10
This signal is emitted when a string search on a page is completed. \a result is
the result of the string search.