summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSze Howe Koh <szehowe.koh@gmail.com>2014-12-05 20:31:57 +0800
committerSze Howe Koh <szehowe.koh@gmail.com>2015-01-02 12:11:14 +0100
commit5dd202c5a53043b3500456b8366a0e826bd2cebb (patch)
tree1b3123e67fa4b13134321c891fc64821e9919ad1
parentfe4676165f7e4915dacd5ebb6a3d087ede7ec410 (diff)
downloadqtdoc-5dd202c5a53043b3500456b8366a0e826bd2cebb.tar.gz
Doc: Add Qt WebEngine Widgets to the module and example lists
This module is new in Qt 5.4. Change-Id: Ia01915d1274b394b1e7905e1f2c21c63e711331a Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
-rw-r--r--doc/src/examples.qdoc1
-rw-r--r--doc/src/qtmodules.qdoc7
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc
index 4b556d1a..66d9d5ee 100644
--- a/doc/src/examples.qdoc
+++ b/doc/src/examples.qdoc
@@ -129,6 +129,7 @@
\li \l{JSON Save Game Example}
\li \l{Qt WebChannel Examples}
\li \l{Qt WebEngine Examples}
+ \li \l{Qt WebEngine Widgets Examples}
\li \l{Qt WebSockets Examples}{WebSocket Examples}
\li \l{Qt WebKit Examples}{WebKit Examples}
\endlist
diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc
index 873fcc54..9de4576a 100644
--- a/doc/src/qtmodules.qdoc
+++ b/doc/src/qtmodules.qdoc
@@ -255,7 +255,12 @@
\li \l[QtWebEngine]{Qt WebEngine}
\li All
\li \l{Qt for Windows}{Windows}, \l{Qt for Linux/X11}{Linux}, and \l{Qt for OS X}{OS X}.
- \li Provides support for web applications using the \l{http://www.chromium.org/Home}{Chromium browser project}.
+ \li Provides a QML API to run web applications using the \l{http://www.chromium.org/Home}{Chromium browser project}.
+ \row
+ \li \l[QtWebEngineWidgets]{Qt WebEngine Widgets}
+ \li All
+ \li \l{Qt for Windows}{Windows}, \l{Qt for Linux/X11}{Linux}, and \l{Qt for OS X}{OS X}.
+ \li Provides a C++ API to run web applications using the \l{http://www.chromium.org/Home}{Chromium browser project}.
\row
\li \l[QtWebSockets]{Qt WebSockets}
\li All