diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-07-30 13:28:49 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-07-30 13:28:49 (GMT) |
| commit | a08b3f5336e5c819b33d922d3a809b5203d728f3 (patch) | |
| tree | 952f42304d50f28ed6651bace587ab7935b29cd0 /demos/qtdemo | |
| parent | 813fc3574a006cb2687715ccf7bdb984a485b173 (diff) | |
| parent | 188ac02e2fb6cc6437b776f8c5b69a508728fbdb (diff) | |
| download | Qt-a08b3f5336e5c819b33d922d3a809b5203d728f3.zip Qt-a08b3f5336e5c819b33d922d3a809b5203d728f3.tar.gz Qt-a08b3f5336e5c819b33d922d3a809b5203d728f3.tar.bz2 | |
Merge commit 'qt/master-stable'
Conflicts:
demos/demos.pro
src/gui/graphicsview/qgraphicsitem_p.h
Diffstat (limited to 'demos/qtdemo')
| -rw-r--r-- | demos/qtdemo/xml/examples.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml index 2560848..a81eead 100644 --- a/demos/qtdemo/xml/examples.xml +++ b/demos/qtdemo/xml/examples.xml @@ -18,6 +18,7 @@ <example filename="browser" name="Browser" /> <example filename="mediaplayer" name="Media Player" /> <example filename="boxes" name="Boxes" /> + <example filename="sub-attaq" name="Sub-attaq" /> </demos> <category dirname="animation" name="Animation Framework"> <example filename="animatedtiles" name="Animated Tiles" /> @@ -26,7 +27,6 @@ <example filename="moveblocks" name="Moving Blocks" /> <example filename="states" name="UI States" /> <example filename="stickman" name="Stickman" /> - <example filename="sub-attaq" name="Sub-attaq" /> </category> <category dirname="qtconcurrent" name="Concurrent Programming"> <example filename="map" name="Map" executable="false" /> |