summaryrefslogtreecommitdiff
path: root/doc/src/platforms/supported-platforms.qdoc
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2013-04-23 13:12:14 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-23 16:58:41 +0200
commitfa2d185fc55e9f0bdb37d0fae2741381740609ee (patch)
tree010582fdbf948ef2e30dd3d3955e8c872773b98b /doc/src/platforms/supported-platforms.qdoc
parentb2ece4371429a8064d77c70c070a969ffd2121a5 (diff)
downloadqtdoc-fa2d185fc55e9f0bdb37d0fae2741381740609ee.tar.gz
Doc: Adapting new title of Multimedia overview.
-change in Qt Multimedia from "Qt Multimedia Overview" to "Multimedia". -central point for multimedia in Qt. Title is consistent with other topics. Change-Id: I6cef9ff286451232ff62879f70fe189f67267e16 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Diffstat (limited to 'doc/src/platforms/supported-platforms.qdoc')
-rw-r--r--doc/src/platforms/supported-platforms.qdoc6
1 files changed, 2 insertions, 4 deletions
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 7647734a..89675b86 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -69,8 +69,7 @@
\li Powerful \l{Thread Support in Qt}{multi-threading} features
\li \l{Graphics View Framework}{2D graphics canvas} capable of
handling millions of items
- \li Multimedia support with \l{QtMultimedia module}{Qt Multimedia
- module}
+ \li \l Multimedia support
\li \l{WebKit in Qt}{WebKit} integration
\li \l{Network programming with Qt}{Networking}, \l{QtXml Module}
{XML} and \l{SQL in Qt}{database} functionality
@@ -182,8 +181,7 @@
\li Powerful \l{Thread Support in Qt}{multi-threading} features
\li \l{Graphics View Framework}{2D graphics canvas} capable of
handling millions of items
- \li \l{Qt Multimedia Overview}{Support for Audio and Video} through the \l{Qt Multimedia}{Qt Multimedia
- module}
+ \li \l Multimedia support
\li \l{WebKit in Qt}{WebKit} integration
\li \l{Network programming with Qt}{Networking}, \l{QtXml Module}
{XML} and \l{SQL in Qt}{database} functionality