summaryrefslogtreecommitdiff
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
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>
-rw-r--r--doc/src/index.qdoc2
-rw-r--r--doc/src/platforms/supported-platforms.qdoc6
-rw-r--r--doc/src/topics.qdoc2
3 files changed, 4 insertions, 6 deletions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index ba3e3433..6d4b09e2 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -85,7 +85,7 @@
\li \l{User Interfaces}
\li \l{Core Internals}
\li \l{Data Storage}
- \li \l{Qt Multimedia Overview}{Multimedia}
+ \li \l{Multimedia}
\li \l{Networking and Connectivity}
\li \l{Graphics}
\li \l{QML Application Developer Resources}{QML Applications}
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
diff --git a/doc/src/topics.qdoc b/doc/src/topics.qdoc
index 5c707d2d..63a1785e 100644
--- a/doc/src/topics.qdoc
+++ b/doc/src/topics.qdoc
@@ -38,7 +38,7 @@ functionality and can be used as a starting point for learning how to to get the
\li \l{User Interfaces}
\li \l{Core Internals}
\li \l{Data Storage}
-\li \l{Qt Multimedia Overview}{Multimedia}
+\li \l{Multimedia}
\li \l{Networking and Connectivity}
\li \l{Graphics}
\li \l{QML Application Developer Resources}{QML Applications}