diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-27 18:08:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-27 18:08:24 (GMT) |
| commit | 615b4b5fba61daf4884f7e2c04fc71a4ab9e0a30 (patch) | |
| tree | c14f6c86223a3135ffd551717132a600e219086b /doc | |
| parent | 6396e7a15079cb157caef319348a0bcd0b95a6a7 (diff) | |
| parent | 0f83dd85ad1113468fa6b23b05dc703a3303bdd6 (diff) | |
| download | Qt-615b4b5fba61daf4884f7e2c04fc71a4ab9e0a30.zip Qt-615b4b5fba61daf4884f7e2c04fc71a4ab9e0a30.tar.gz Qt-615b4b5fba61daf4884f7e2c04fc71a4ab9e0a30.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Autotest: no need to call exitLoop twice, from two threads.
Fix compilation with Sun CC: __FUNCTION__ is not valid
Fix compilation with Sun CC: const in POD parameters makes a difference
Fix compilation on solaris-g++-x86-64: emmintrin.h is not available.
Unbreak compilation of bootstrapped Qt tools after f3eab3d.
QUrl: document adding of hash function
Bump iteration count to make QMetaType::type() benchmark results more stable
Don't lock the QMetaType custom types mutex unnecessarily
Fix deadlock in QFSEventsFileSystemWatcherEngine.
Improve lookup speed of QMetaType::type() for normalized types
Add benchmarks for QMetaType type introspection functions
Modified configure script not to override $XPLATFORM in case of CYGWIN
Doc: summarize new QtMultimedia functionality in What's New page.
doc: Added \since 4.7 to several \qmlclass elements.
check that wifi is powered on before trying to scan.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/qt4-intro.qdoc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index a18bc13..cf53df0 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -483,7 +483,14 @@ QNetworkAccessManager uses this API for HTTP level roaming. - \section1 Multimedia - playback and playlist management + \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. |