diff options
author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-10-16 02:23:19 (GMT) |
---|---|---|
committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-10-16 02:23:19 (GMT) |
commit | 17ca7dfba2cc39a17873169c205aa1e88b03b970 (patch) | |
tree | b708db35acacdf6ac1596e2df21e505052f62f35 /doc/src/getting-started/examples.qdoc | |
parent | 46616a79db9ab11ce726243f12615a478a4c368a (diff) | |
parent | 077f9711f0b9174ef9e9ffa7022aa06a9b3fc867 (diff) | |
download | Qt-17ca7dfba2cc39a17873169c205aa1e88b03b970.zip Qt-17ca7dfba2cc39a17873169c205aa1e88b03b970.tar.gz Qt-17ca7dfba2cc39a17873169c205aa1e88b03b970.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'doc/src/getting-started/examples.qdoc')
-rw-r--r-- | doc/src/getting-started/examples.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc index d72f816..d6ade22 100644 --- a/doc/src/getting-started/examples.qdoc +++ b/doc/src/getting-started/examples.qdoc @@ -806,16 +806,16 @@ Audio API in Qt applications. \list - \o \l{multimedia/audio/audiodevices}{Audio Devices} - \o \l{multimedia/audio/audiooutput}{Audio Output} - \o \l{multimedia/audio/audioinput}{Audio Input} + \o \l{multimedia/audiodevices}{Audio Devices} + \o \l{multimedia/audiooutput}{Audio Output} + \o \l{multimedia/audioinput}{Audio Input} \endlist \section1 Video Output \list - \o \l{video/videowidget}{Video Widget}\raisedaster - \o \l{video/videographicsitem}{Video Graphics Item} + \o \l{multimedia/videowidget}{Video Widget}\raisedaster + \o \l{multimedia/videographicsitem}{Video Graphics Item} \endlist \section1 Phonon |