From 4a56c235e1bd12071e58d36113fccb270ee98a5e Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Fri, 17 Jul 2015 12:27:28 +0200 Subject: Doc: Added \qtvariable to enable QDoc include QT += info. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also added \since info. for some of the classes. Task-number: QTBUG-47274 Change-Id: Id8cfbd6d0e5b5826ceaebb008a453cd1c216a921 Reviewed-by: Topi Reiniö --- src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc') diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index 3088a66b6..080f4796a 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc @@ -27,7 +27,7 @@ /*! \class QWebEnginePage \brief The QWebEnginePage class provides an object to view and edit web documents. - + \since 5.4 \inmodule QtWebEngineWidgets QWebEnginePage holds a main frame responsible for web content, the history -- cgit v1.2.3 From 1a95aeaa05ddca83df9648e96dad6e40054b3bec Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 17 Jul 2015 10:06:13 +0200 Subject: Fix docs to use iconUrl/iconUrlChanged. The docs presumably were copied from QtWebKit and this didn't get adjusted when icon()/iconChanged() was changed to iconUrl()/iconUrlChanged(). Change-Id: Iccecc7b0e1c69f5242bddae2dedb4135120e3519 Reviewed-by: Joerg Bornemann --- src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc') diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index 080f4796a..b4265a595 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc @@ -50,8 +50,8 @@ The title of an HTML page can be accessed with the title() property. Additionally, a page may also specify an icon, which can be accessed - using the icon() property. If the title or the icon changes, the - corresponding titleChanged() and iconChanged() signals will be emitted. + using the iconUrl() property. If the title or the icon changes, the + corresponding titleChanged() and iconUrlChanged() signals will be emitted. The zoomFactor() property can be used to change the overall size of the content displayed in the page. -- cgit v1.2.3 From 17bc5b29783ff922c065324a2318bec3deb79cb1 Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Fri, 31 Jul 2015 11:51:19 +0200 Subject: Doc: Added a note about setting feature permission to a page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The feature premissions set ahead of a feature request has no effect. The QWebEnginePage::setFeaturePermission method serves pending feature requests only. Task-number: QTBUG-47173 Change-Id: Ifff4dadc56fae1ecdcce9029a15d57576a830923 Reviewed-by: Topi Reiniö --- src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc') diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index b4265a595..40c5c8d04 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc @@ -570,6 +570,10 @@ Sets the permission for the web site identified by \a securityOrigin to use \a feature to \a policy. + \note Call this method on featurePermissionRequested() signal, as it is + meant to serve pending feature requests only. Setting feature permissions + ahead of a request has no effect. + \sa featurePermissionRequested(), featurePermissionRequestCanceled() */ -- cgit v1.2.3