diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2010-08-17 05:30:30 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2010-08-17 05:30:30 (GMT) |
| commit | ae1fde5d436a047c124f8382fdcd71bb1af306e3 (patch) | |
| tree | a937de1c678aaeda2f12fac891f49930d244e954 /doc/src/getting-started/demos.qdoc | |
| parent | 50a53d2f7a7e12cd597dc72a08ad62b79fee4554 (diff) | |
| parent | 8afc6773067bb878020c29b3bebfe8662e3fbfdd (diff) | |
| download | Qt-ae1fde5d436a047c124f8382fdcd71bb1af306e3.zip Qt-ae1fde5d436a047c124f8382fdcd71bb1af306e3.tar.gz Qt-ae1fde5d436a047c124f8382fdcd71bb1af306e3.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'doc/src/getting-started/demos.qdoc')
| -rw-r--r-- | doc/src/getting-started/demos.qdoc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/doc/src/getting-started/demos.qdoc b/doc/src/getting-started/demos.qdoc index ef16224..4003988 100644 --- a/doc/src/getting-started/demos.qdoc +++ b/doc/src/getting-started/demos.qdoc @@ -134,7 +134,7 @@ \section1 QtWebKit \list - \o \l{Web Browser} demonstrates how Qt's \l{QtWebKit Module}{WebKit module} + \o \l{Web Browser} demonstrates how Qt's \l{WebKit in Qt}{WebKit module} can be used to implement a small Web browser. \endlist @@ -147,6 +147,15 @@ \note The Phonon demos are currently not available for the MinGW platform. + \section1 Multimedia + + \list + \o \l{demos/spectrum}{Spectrum Analyzer} demonstrates how the \l{QtMultimedia Module} + can be used to capture and play back an audio stream, at the same time allowing the + application to access the raw audio data. This application analyzes the audio stream + in order to display a frequency spectrum. + \endlist + \section1 Animation \list |