diff options
| author | ninerider <qt-info@nokia.com> | 2009-10-09 12:33:03 (GMT) |
|---|---|---|
| committer | ninerider <qt-info@nokia.com> | 2009-10-09 12:33:03 (GMT) |
| commit | d788b9356fcf6cce041c021ae4dc5087a6ce40ce (patch) | |
| tree | 379e9ce3aa94c2e3a511fb2db3f64b0efab853d9 /doc/src/getting-started | |
| parent | b7a780e057642b2829238cd8e83b812ea963f687 (diff) | |
| parent | 9ac420db693aecd5f9f1c51f305a0148f46636ba (diff) | |
| download | Qt-d788b9356fcf6cce041c021ae4dc5087a6ce40ce.zip Qt-d788b9356fcf6cce041c021ae4dc5087a6ce40ce.tar.gz Qt-d788b9356fcf6cce041c021ae4dc5087a6ce40ce.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'doc/src/getting-started')
| -rw-r--r-- | doc/src/getting-started/demos.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/getting-started/examples.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/getting-started/demos.qdoc b/doc/src/getting-started/demos.qdoc index 532715e..8f2829a 100644 --- a/doc/src/getting-started/demos.qdoc +++ b/doc/src/getting-started/demos.qdoc @@ -157,7 +157,7 @@ \section1 Phonon \list - \o \l{demos/mediaplayer}{Media Player} demonstrates how the \l{Phonon Module} can be + \o \l{demos/qmediaplayer}{Media Player} demonstrates how the \l{Phonon Module} can be used to implement a basic media player application. \endlist diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc index 30dae88..2ad730a7 100644 --- a/doc/src/getting-started/examples.qdoc +++ b/doc/src/getting-started/examples.qdoc @@ -827,7 +827,7 @@ \list \o \l{phonon/capabilities}{Capabilities}\raisedaster - \o \l{phonon/musicplayer}{Music Player}\raisedaster + \o \l{phonon/qmusicplayer}{Music Player}\raisedaster \endlist */ |