summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@theqtcompany.com>2016-01-14 11:11:13 +0100
committerTopi Reiniƶ <topi.reinio@theqtcompany.com>2016-01-18 09:35:59 +0000
commit56c80c1a573a50b68d52581449324a60741ac5c0 (patch)
treeb225e155a91113aabdd2ca266a589a779cf6fc31
parent2e0e099cf5262496eddf2608a96da4ee375cd2e9 (diff)
downloadqtdoc-56c80c1a573a50b68d52581449324a60741ac5c0.tar.gz
Doc: Update information about technology preview modules
- Update status and descriptions on 'What's New' page - Add Qt Speech, Qt Wayland Compositor to 'Qt Modules' page - Add external links to doc.qt.io for them Change-Id: I4a8372789adc708c16cdd9d55ead502563f8fc2f Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
-rw-r--r--doc/src/external-resources.qdoc10
-rw-r--r--doc/src/qtmodules.qdoc4
-rw-r--r--doc/src/whatsnew/whatsnew56.qdoc16
3 files changed, 27 insertions, 3 deletions
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 69d79e14..b6e33e41 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -248,6 +248,16 @@
*/
/*!
+ \externalpage http://doc.qt.io/qt-5/qtspeech-index.html
+ \title Qt Speech
+*/
+
+/*!
+ \externalpage http://doc.qt.io/qt-5/qtwaylandcompositor-index.html
+ \title Qt Wayland Compositor
+*/
+
+/*!
\externalpage http://doc.qt.io/QtSupportedPlatforms/index.html
\title Officially Supported Platforms
*/
diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc
index 5d01a5f6..45705bfe 100644
--- a/doc/src/qtmodules.qdoc
+++ b/doc/src/qtmodules.qdoc
@@ -370,6 +370,10 @@
when compared to \l {Qt Quick Controls}, on which the module is based.
These types work in conjunction with \l{Qt Quick} and \l{Qt Quick
Layouts}.
+ \row \li \l{Qt Speech}
+ \li Provides support for accessibility features such as text-to-speech.
+ \row \li \l{Qt Wayland Compositor}
+ \li Provides a framework to develop a Wayland compositor.
\endtable
\section1 Qt Tools
diff --git a/doc/src/whatsnew/whatsnew56.qdoc b/doc/src/whatsnew/whatsnew56.qdoc
index 575b9863..416bc4ef 100644
--- a/doc/src/whatsnew/whatsnew56.qdoc
+++ b/doc/src/whatsnew/whatsnew56.qdoc
@@ -34,12 +34,22 @@
\list
\li \l{Qt Labs Controls}
+ \list
+ \li Included as a technology preview.
+ \li Provides lightweight QML types for creating performant user interfaces
+ for embedded and mobile devices.
+ \endlist
+
\li \l{Qt Speech}
- \li \l{Qt SerialBus}
+ \list
+ \li Included as a technology preview.
+ \li Provides support for accessibility features such as text-to-speech.
+ \endlist
+ \li \l{Qt Serial Bus}
\list
\li Included as a technology preview.
- \li Provides a framework for accessing serial bus backends in general, and a plugin for
- accessing the SocketCAN backend in particular.
+ \li Provides a framework for accessing serial bus backends in general, and
+ implementations for Controller Area Network (CAN) bus and Modbus.
\endlist
\li \l{Qt Wayland Compositor}{Qt Compositor}(Qt Wayland)
\list