From f62f223b28989ee827f26969274f544c8e7d3e97 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 2 Mar 2016 11:22:11 +0100 Subject: Doc: Quote example code from the Minimal example Change-Id: I0050a0090e4e0877dc56b8c529d9cbb77a0cdd33 Reviewed-by: Kai Koehne --- src/webengine/doc/src/webengineview.qdoc | 35 ++++++-------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) (limited to 'src/webengine/doc/src/webengineview.qdoc') diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc index fc21480ad..d2dc627a3 100644 --- a/src/webengine/doc/src/webengineview.qdoc +++ b/src/webengine/doc/src/webengineview.qdoc @@ -40,19 +40,9 @@ \l QtWebEngine::initialize in the application main source file, as illustrated by the following code snippet: - \code - int main(int argc, char **argv) - { - Application app(argc, argv); - - QtWebEngine::initialize(); - - QQmlApplicationEngine appEngine; - appEngine.load(QUrl("qrc:/main.qml")); - - return app.exec(); - } - \endcode + \quotefromfile webengine/minimal/main.cpp + \skipto main + \printuntil } \section2 Loading Web Pages @@ -62,22 +52,9 @@ The following sample QML application loads a web page using the \c url property: - \qml - import QtQuick 2.1 - import QtQuick.Controls 1.1 - import QtWebEngine 1.1 - - ApplicationWindow { - width: 1280 - height: 720 - visible: true - WebEngineView { - id: webview - url: "http://www.qt.io" - anchors.fill: parent - } - } - \endqml + \quotefromfile webengine/minimal/main.qml + \skipto import + \printuntil /^\}/ The \l loadingChanged() signal is emitted when loading a page begins, ends, or fails. The \l loading property holds whether the HTML page is currently loading and the load status is -- cgit v1.2.3 From fab5cff1171de54f43d9ab57ed16f8d0f85b433e Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 1 Mar 2016 16:21:49 +0100 Subject: Doc: Improve docs for the zoomFactor property In the WebEngineView type and QWebEnginePage and QWebEngineView docs. Change-Id: Ibbabcf6cc38a48fb14abb105f5fda4c03a89ccba Reviewed-by: Kai Koehne --- src/webengine/doc/src/webengineview.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/webengine/doc/src/webengineview.qdoc') diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc index d2dc627a3..da0df4d9e 100644 --- a/src/webengine/doc/src/webengineview.qdoc +++ b/src/webengine/doc/src/webengineview.qdoc @@ -62,7 +62,7 @@ The title of an HTML page can be accessed with the \l title property. Additionally, a web page may specify an icon, which can be accessed using the \l icon property. The \l zoomFactor - property holds the overall size of the contents of the web page. + property enables zooming the contents of the web page by a scale factor. If a certificate error is raised while loading a web page, the \l certificateError() signal is emitted. Certificate errors are handled by using the methods of the WebEngineCertificateError -- cgit v1.2.3 From 963f90b7a07236d81d7bb65798c641556501ab10 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 2 Mar 2016 13:21:18 +0100 Subject: Doc: Restructure paragraph about loading pages Describe the "loading" property first and remove the "LoadStatus" enumeration. Change-Id: I2357c604197c305e9cd2d3ff7dd322949b1b9e4b Reviewed-by: Kai Koehne --- src/webengine/doc/src/webengineview.qdoc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/webengine/doc/src/webengineview.qdoc') diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc index da0df4d9e..574b5e70f 100644 --- a/src/webengine/doc/src/webengineview.qdoc +++ b/src/webengine/doc/src/webengineview.qdoc @@ -56,9 +56,8 @@ \skipto import \printuntil /^\}/ - The \l loadingChanged() signal is emitted when loading a page begins, ends, or fails. The - \l loading property holds whether the HTML page is currently loading and the load status is - reflected in the \l LoadStatus property. + The \l loading property holds whether an HTML page is currently loading. + The \l loadingChanged() signal is emitted when loading the page begins, ends, or fails. The title of an HTML page can be accessed with the \l title property. Additionally, a web page may specify an icon, which can be accessed using the \l icon property. The \l zoomFactor -- cgit v1.2.3