diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 13:22:16 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 13:24:12 +0100 |
| commit | ec316b3b7973efa3f2d2af211b95bc8b45b42a50 (patch) | |
| tree | b3f0445661ccddb4d11a6a90cf944400205edfd8 /src/multimedia/doc/src/qtmultimedia-index.qdoc | |
| parent | c2736c3a629d944818c44db9ad69beffb872bdd5 (diff) | |
| parent | 6902c5d770bfa79522d4349215c0b582642c7594 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
sync.profile
Change-Id: I450b86e3d01498aca12fe11a28527a296f2cbc3f
Diffstat (limited to 'src/multimedia/doc/src/qtmultimedia-index.qdoc')
| -rw-r--r-- | src/multimedia/doc/src/qtmultimedia-index.qdoc | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc index dcf438d51..e7838cfd8 100644 --- a/src/multimedia/doc/src/qtmultimedia-index.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc @@ -128,23 +128,6 @@ \section2 Examples \list - \li QML - \list - \li \l{video/qmlvideo}{qmlvideo} - \li \l{video/qmlvideofx}{qmlvideofx} - \li \l{declarative-camera} - \li \l{declarative-radio} - \endlist - \li C++ - \list - \li \l{audiooutput} - \li \l{audioinput} - \li \l{audiorecorder} - \li \l{audiodevices} - \li \l{spectrum} - \li \l{AudioEngine Example}{Audio Engine} - \li \l{player} - \li \l{Camera Example} - \endlist + \li \l{Qt Multimedia Examples} \endlist */ |