Changeset 561 for trunk/demos/qtdemo/xml

Timestamp:

Feb 11, 2010, 11:19:06 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• demos/qtdemo/xml/examples.xml (modified) (9 diffs)

trunk/demos/qtdemo/xml/examples.xml

@@ -17 +17 @@
     <example filename="interview" name="Interview" />
     <example filename="browser" name="Browser" />
-    <example filename="mediaplayer" name="Media Player" />
+    <example filename="mediaplayer" name="Media Player" />
     <example filename="boxes" name="Boxes" />
+
   </demos>
+
+
+
+
+
+
+
+
   <category dirname="qtconcurrent" name="Concurrent Programming">
     <example filename="map" name="Map" executable="false" />
@@ -79 +88 @@
     <example filename="dirview" name="Directory View" />
     <example filename="fetchmore" name="Fetch More" />
+
     <example filename="pixelator" name="Pixelator" />
     <example filename="puzzle" name="Puzzle " image="itemviewspuzzle-example.png"/>
@@ -113 +123 @@
     <example filename="fortuneclient" name="Fortune Client" />
     <example filename="fortuneserver" name="Fortune Server" />
-    <example filename="ftp" changedirectory="false" name="FTP Client" />
+    <example filename="ftp" changedirectory="false" name="FTP Client" />
     <example filename="http" changedirectory="false" name="HTTP Client" />
     <example filename="loopback" name="Loopback" />
@@ -119 +129 @@
     <example filename="torrent" name="Torrent Client" />
     <example filename="securesocketclient" name="Secure Socket Client" />
+
   </category>
   <category dirname="opengl" name="OpenGL">
@@ -143 +154 @@
   </category>
   <category dirname="phonon" name="Phonon">
-    <example filename="musicplayer" name="Music Player" />
+    <example filename="qmusicplayer" name="Music Player" />
+  </category>
+  <category dirname="multimedia" 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">
@@ -167 +183 @@
     <example filename="sqlwidgetmapper" name="SQL Widget Mapper" />
   </category>
+
+
+
+
+
+
   <category dirname="threads" name="Threading">
     <example filename="mandelbrot" name="Mandelbrot" />
@@ -175 +197 @@
     <example filename="customcompleter" name="Custom Completer" />
     <example filename="i18n" name="Internationalization" />
+
     <example filename="plugandpaint" name="Plug and Paint" />
     <example filename="regexp" name="Regular Expressions" />
@@ -214 +237 @@
     <example filename="windowflags" name="Window Flags" />
   </category>
+
+
+
+
+
+
   <category dirname="xml" name="XML">
     <example filename="saxbookmarks" name="SAX Bookmarks" />
@@ -225 +254 @@
     <example filename="filetree" name="File Tree" />
     <example filename="trafficinfo" name="Traffic Info" />
+
   </category>  
 </categories>