diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-06 06:38:11 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-06 07:18:48 (GMT) |
| commit | 55c4f15df0d482c7d3d6c889b9fc132ed0bdd12a (patch) | |
| tree | 99c01d7a4e0941f415e9a48f51faac94787b6cb0 /demos | |
| parent | 57ceb11ecf95032418712a686418116cf2398e7a (diff) | |
| parent | b008dfbd67176948f6fdf830dc99d23a538a6b9c (diff) | |
| download | Qt-55c4f15df0d482c7d3d6c889b9fc132ed0bdd12a.zip Qt-55c4f15df0d482c7d3d6c889b9fc132ed0bdd12a.tar.gz Qt-55c4f15df0d482c7d3d6c889b9fc132ed0bdd12a.tar.bz2 | |
Merge commit 'qt/master-stable'
Conflicts:
configure.exe
doc/src/classes/qnamespace.qdoc
examples/examples.pro
src/corelib/kernel/qcoreevent.cpp
src/corelib/kernel/qobject.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qstandardgestures.h
src/gui/kernel/qwidget.cpp
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/qtdemo/xml/examples.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml index 006bfd0..1b0b533 100644 --- a/demos/qtdemo/xml/examples.xml +++ b/demos/qtdemo/xml/examples.xml @@ -154,6 +154,11 @@ <category dirname="phonon" name="Phonon"> <example filename="musicplayer" name="Music Player" /> </category> + <category dirname="multimedia/audio" name="Multimedia"> + <example filename="audiodevices" name="Audio Devices" /> + <example filename="audiooutput" name="Audio Output" /> + <example filename="audioinput" name="Audio Input" /> + </category> <category dirname="richtext" name="Rich Text"> <example filename="calendar" name="Calendar" /> <example filename="orderform" name="Order Form" /> |