From 647307f534d45758832f23912ed281af819f0174 Mon Sep 17 00:00:00 2001
From: Szabolcs David <davidsz@inf.u-szeged.hu>
Date: Wed, 23 Aug 2017 16:28:48 +0200
Subject: [PATCH] Fix documentation of FullScreenRequest
It was registered as FullScreenRequest in plugin.cpp,
not WebEngineFullScreenRequest.
Change-Id: Ib9eec950a0f54aad2dbc31e54d6d5c6a6838ac65
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
---
.../quicknanobrowser/doc/src/quicknanobrowser.qdoc | 4 ++--
src/webengine/doc/src/webengineview.qdoc | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc b/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc
index 93b3ed51a..190604fc4 100644
--- a/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc
+++ b/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc
@@ -115,9 +115,9 @@
We create a menu item for allowing fullscreen mode in a settings menu that we place on the tool
bar. Also, we create an action for leaving fullscreen mode by using a keyboard shortcut.
- We call the \l{WebEngineFullScreenRequest::}{accept()} method to accept the fullscreen request.
+ We call the \l{FullScreenRequest::}{accept()} method to accept the fullscreen request.
The methdod sets the \l{WebEngineView::}{isFullScreen} property to be equal to the
- \l{WebEngineFullScreenRequest::}{toggleOn} property.
+ \l{FullScreenRequest::}{toggleOn} property.
\quotefromfile webengine/quicknanobrowser/BrowserWindow.qml
\skipto onFullScreenRequested
diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc
index 1d1c61f03..e14448aa4 100644
--- a/src/webengine/doc/src/webengineview.qdoc
+++ b/src/webengine/doc/src/webengineview.qdoc
@@ -112,7 +112,7 @@
A web page can request through the JavaScript API to be loaded in fullscreen mode. The
\l fullScreenRequested() signal is emitted when the web page issues the request. The
- WebEngineFullScreenRequest utility type can be used to toggle fullscreen requests. The
+ FullScreenRequest utility type can be used to toggle fullscreen requests. The
\l fullScreenCancelled method can be used to notify the browser engine when the windowing
system forces the application to leave fullscreen mode.
@@ -576,7 +576,7 @@
*/
/*!
- \qmlsignal WebEngineView::fullScreenRequested(WebEngineFullScreenRequest request)
+ \qmlsignal WebEngineView::fullScreenRequested(FullScreenRequest request)
\since QtWebEngine 1.1
This signal is emitted when the web page requests fullscreen mode through the
@@ -1039,7 +1039,7 @@
*/
/*!
- \qmltype WebEngineFullScreenRequest
+ \qmltype FullScreenRequest
\instantiates QQuickWebEngineFullScreenRequest
\inqmlmodule QtWebEngine
\since QtWebEngine 1.1
@@ -1050,13 +1050,13 @@
*/
/*!
- \qmlproperty url WebEngineFullScreenRequest::origin
+ \qmlproperty url FullScreenRequest::origin
\readonly
The URL of the web page that issued the fullscreen request.
*/
/*!
- \qmlproperty bool WebEngineFullScreenRequest::toggleOn
+ \qmlproperty bool FullScreenRequest::toggleOn
\readonly
Returns \c{true} if the application should toggle fullscreen mode on, \c{false} otherwise.
@@ -1065,7 +1065,7 @@
*/
/*!
- \qmlmethod void WebEngineFullScreenRequest::accept()
+ \qmlmethod void FullScreenRequest::accept()
Call this method to accept the fullscreen request. It sets the WebEngineView::isFullScreen
property to be equal to toggleOn.
@@ -1089,7 +1089,7 @@
*/
/*!
- \qmlmethod void WebEngineFullScreenRequest::reject()
+ \qmlmethod void FullScreenRequest::reject()
Rejects a fullscreen request.
*/
--
GitLab