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/qtwebengine-overview.qdoc | 35 +++++-------------------- 1 file changed, 6 insertions(+), 29 deletions(-) (limited to 'src/webengine/doc/src/qtwebengine-overview.qdoc') diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc index 9dc78a736..6ec345cb0 100644 --- a/src/webengine/doc/src/qtwebengine-overview.qdoc +++ b/src/webengine/doc/src/qtwebengine-overview.qdoc @@ -164,19 +164,9 @@ engine must be initialized by using \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 } An application can load pages into the WebEngineView, using either an URL or HTML string, and navigate within session history. By default, links to different pages load within the same @@ -186,22 +176,9 @@ The following sample QML application loads a web page using the \l{WebEngineView::}{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 /^\}/ \section1 Managing Certificates -- cgit v1.2.3 From f66c8894268e25d58f7a405914f81595ce6ac8c1 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 29 Mar 2016 14:16:09 +0200 Subject: Doc: Fix documentation about cookie stores Remove misleading "singleton, if one has been set" from the accessor's documentation. Also link to the accessor's from the class documentation, and remove mentioning of cookie store as something that can be accessed for an individual page. Finally, mark QWebEngineProfile::cookieStore as new in Qt 5.6. Change-Id: Ia20ca0ef45a9a15de0052f7ceb7f59d454c70fdc Reviewed-by: Florian Bruhin Reviewed-by: Leena Miettinen --- src/webengine/doc/src/qtwebengine-overview.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/webengine/doc/src/qtwebengine-overview.qdoc') diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc index 6ec345cb0..1ac7710a9 100644 --- a/src/webengine/doc/src/qtwebengine-overview.qdoc +++ b/src/webengine/doc/src/qtwebengine-overview.qdoc @@ -152,7 +152,7 @@ Each QWebEnginePage belongs to a QWebEngineProfile that can have a QWebEngineSettings for specifying page settings, a QWebEngineScriptCollection for running scripts on the page, and a QWebEngineCookieStore for accessing the HTTP cookies of Chromium. A QWebEnginePage can also - directly point to a script collection or cookie store. + directly point to a script collection. \section1 Embedding Web Content into Qt Quick Applications -- cgit v1.2.3 From 6d72c4ce5a6948d4c495b3d7560a7449a40917c0 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 4 Apr 2016 10:04:02 +0200 Subject: Doc: Replace "web engine script" with class and type names Change-Id: I644475dc966b9a0a13bba242b653d2bc2357f24b Reviewed-by: Allan Sandfeld Jensen --- src/webengine/doc/src/qtwebengine-overview.qdoc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/webengine/doc/src/qtwebengine-overview.qdoc') diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc index 1ac7710a9..c26497799 100644 --- a/src/webengine/doc/src/qtwebengine-overview.qdoc +++ b/src/webengine/doc/src/qtwebengine-overview.qdoc @@ -121,8 +121,9 @@ created is not suitable for DOM operations, where one has to wait until the DOM is ready. In addition, an injected script shares the same \e world as the other scripts executed on the - page, which might lead to conflicts. To avoid this, the Chromium API for - \e{Content Script Extensions} is implemented by \e {web engine script}. It specifies the + page, which might lead to conflicts. To avoid this, the QWebEngineScript class and the + WebEngineScript QML type provide implementations of the Chromium API for + \e{Content Script Extensions}. They specify the script to run, the injection point, and the world where the script is run. This enables accessing the DOM to manipulate it within a world. -- cgit v1.2.3 From 58e26ce0fc9b04c015c450a5d2448a4cad0ddfe0 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 4 Apr 2016 10:51:01 +0200 Subject: Doc: WebEngine does not support Chromium extensions For example, @include, @match, and @exclude. Change-Id: I16d29b4e72452980e43c8e7c5702e21cccf159d5 Reviewed-by: Kai Koehne --- src/webengine/doc/src/qtwebengine-overview.qdoc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/webengine/doc/src/qtwebengine-overview.qdoc') diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc index c26497799..08424f7c2 100644 --- a/src/webengine/doc/src/qtwebengine-overview.qdoc +++ b/src/webengine/doc/src/qtwebengine-overview.qdoc @@ -127,6 +127,8 @@ script to run, the injection point, and the world where the script is run. This enables accessing the DOM to manipulate it within a world. + \note Chromium extensions, such as \c @include, \c @match, and \c @exclude, are not supported. + Because the render process is separated from the GUI process, they should ideally share an OpenGL context to enable one process to access the resources uploaded by the other, such as images or textures. However, some inter-process communication is needed for safety and -- cgit v1.2.3