diff options
| author | Geir Vattekar <geir.vattekar@nokia.com> | 2010-09-16 09:14:47 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@nokia.com> | 2010-09-16 09:14:47 (GMT) |
| commit | e5f43b4fb606b4001f271c20a1fe7e6c3d24457e (patch) | |
| tree | 7ef9aefcdbed96d3342cbcb1fe0a6bf83b3c764a /doc/src/qt4-intro.qdoc | |
| parent | 73a0b6d754f075ece6505809847d54698b605d96 (diff) | |
| parent | 67aa771cc04044a96b4653adb86692a7bcac1b87 (diff) | |
| download | Qt-e5f43b4fb606b4001f271c20a1fe7e6c3d24457e.zip Qt-e5f43b4fb606b4001f271c20a1fe7e6c3d24457e.tar.gz Qt-e5f43b4fb606b4001f271c20a1fe7e6c3d24457e.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'doc/src/qt4-intro.qdoc')
| -rw-r--r-- | doc/src/qt4-intro.qdoc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index 8684ad2..efbfc0c 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -489,15 +489,6 @@ QNetworkAccessManager uses this API for HTTP level roaming. - \section1 Multimedia - playback and declarative elements - - The Multimedia API provides media playback and playlist support - for Qt Applications. Play music and movies through a single interface - with selectable output for movies to widgets or graphics view. - - Multimedia support for Quick is also available with the new multimedia - declarative elements. - \section1 New Classes, Functions, Macros, etc. Links to new classes, elements, functions, macros, and other items |