summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-01-22 09:30:32 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-01-22 09:30:32 +0100
commit477bb7483c1d4f47d42f12975f0dee66d8cf234e (patch)
tree1bc3fbcb6a289ff0d525c96210f0d3de62e366cc
parentf2e136c1a16bf2fe3a9ebe392fddd34ad83caede (diff)
parent161e4ec3af7d6c952f1a4b3c44ec6722dc1c0a18 (diff)
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts: .qmake.conf Change-Id: Ie4899e2bd65efbebd566081264a59acedcb262fe
-rw-r--r--src/webview/doc/qtwebview.qdocconf2
-rw-r--r--src/webview/doc/src/qtwebview-overview.qdoc11
2 files changed, 8 insertions, 5 deletions
diff --git a/src/webview/doc/qtwebview.qdocconf b/src/webview/doc/qtwebview.qdocconf
index 96cf19e..70da9a4 100644
--- a/src/webview/doc/qtwebview.qdocconf
+++ b/src/webview/doc/qtwebview.qdocconf
@@ -35,7 +35,7 @@ exampledirs += ../../../examples/webview
imagedirs += images
examplesinstallpath = webview
-depends = qtcore qtdoc qtgui qtquick qtqml
+depends = qtcore qtdoc qtgui qtquick qtqml qtwebengine
Cpp.ignoretokens += Q_WEBVIEW_EXPORT
diff --git a/src/webview/doc/src/qtwebview-overview.qdoc b/src/webview/doc/src/qtwebview-overview.qdoc
index 067e4bd..195a0f5 100644
--- a/src/webview/doc/src/qtwebview-overview.qdoc
+++ b/src/webview/doc/src/qtwebview-overview.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -31,7 +31,7 @@
\title Qt WebView
\brief A light-weight web view.
- Qt WebView provides a way to display web content in a QML application without
+ Qt \WebView provides a way to display web content in a QML application without
necessarily including a full web browser stack by using native APIs where
it makes sense.
@@ -40,9 +40,12 @@
on iOS, where policy dictates that all web content is displayed using the
operating system's web view.
+ On Windows, Linux, and \macos, Qt \WebView depends on the \l{Qt WebEngine}
+ module to render content.
+
\section1 Prerequisites
- To make the Qt WebView module function correctly across all platforms, it's necessary
+ To make the Qt \WebView module function correctly across all platforms, it's necessary
to call \l {qtwebview-initialize}{QtWebView::initialize}() right after creating the
QGuiApplication instance.
@@ -64,7 +67,7 @@
\section1 Licenses
- Qt WebView is available under commercial licenses from \l{The Qt Company}.
+ Qt \WebView is available under commercial licenses from \l{The Qt Company}.
In addition, it is available under the
\l{GNU Lesser General Public License, version 3}, or
the \l{GNU General Public License, version 2}.