Move audio and video examples into the common multimedia directory.

Brings the video examples into multimedia directory, and removes the
audio sub-directory so the directory structure is in line with the other
example categories.

Task-number: QT-667
Reviewed-by: Kurt Korbatits

38 files changed, 52 insertions, 53 deletions

diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml
index 2c31484b1a..83bd200511 100644
--- a/demos/qtdemo/xml/examples.xml
+++ b/demos/qtdemo/xml/examples.xml
@@ -154,7 +154,7 @@
   <category dirname="phonon" name="Phonon">
     <example filename="qmusicplayer" name="Music Player" />
   </category>
-  <category dirname="multimedia/audio" name="Multimedia">
+  <category dirname="multimedia" name="Multimedia">
     <example filename="audiodevices" name="Audio Devices" />
     <example filename="audiooutput" name="Audio Output" />
     <example filename="audioinput" name="Audio Input" />
diff --git a/doc/src/examples/audiodevices.qdoc b/doc/src/examples/audiodevices.qdoc
index 0d0932ea33..1505846174 100644
--- a/doc/src/examples/audiodevices.qdoc
+++ b/doc/src/examples/audiodevices.qdoc
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 /*!
-    \example multimedia/audio/audiodevices
+    \example multimedia/audiodevices
     \title Audio Devices Example
 
     The Audio Devices example demonstrates the basic use of QAudioDeviceInfo class
diff --git a/doc/src/examples/audioinput.qdoc b/doc/src/examples/audioinput.qdoc
index ac44d75374..8553e92fe3 100644
--- a/doc/src/examples/audioinput.qdoc
+++ b/doc/src/examples/audioinput.qdoc
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 /*!
-    \example multimedia/audio/audioinput
+    \example multimedia/audioinput
     \title AudioInput Example
 
     The Audio Input example demonstrates the basic use of QAudioInput class
diff --git a/doc/src/examples/audiooutput.qdoc b/doc/src/examples/audiooutput.qdoc
index 2ed6ce4f94..58b8ea9e61 100644
--- a/doc/src/examples/audiooutput.qdoc
+++ b/doc/src/examples/audiooutput.qdoc
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 /*!
-    \example multimedia/audio/audiooutput
+    \example multimedia/audiooutput
     \title Audio Output Example
 
     The Audio Output example demonstrates the basic use of the QAudioOutput class
diff --git a/doc/src/examples/videographicsitem.qdoc b/doc/src/examples/videographicsitem.qdoc
index ce24f097c5..e1cb6edacd 100644
--- a/doc/src/examples/videographicsitem.qdoc
+++ b/doc/src/examples/videographicsitem.qdoc
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 /*!
-    \example video/videographicsitem
+    \example multimedia/videographicsitem
     \title Video Graphics Item Example
 
     The Video Graphics Item example shows how to implement a QGraphicsItem that displays video on a
diff --git a/doc/src/examples/videowidget.qdoc b/doc/src/examples/videowidget.qdoc
index 1b214d27f9..4223c1fb95 100644
--- a/doc/src/examples/videowidget.qdoc
+++ b/doc/src/examples/videowidget.qdoc
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 /*!
-    \example video/videowidget
+    \example multimedia/videowidget
     \title Video Widget Example
 
     The Video Widget example shows how to implement a video widget using
@@ -50,7 +50,7 @@
 
     \section1 VideoWidgetSurface Class Definition
 
-    \snippet examples/video/videowidget/videowidgetsurface.h 0
+    \snippet examples/multimedia/videowidget/videowidgetsurface.h 0
 
     The VideoWidgetSurface class inherits QAbstractVideoSurface and paints
     video frames on a QWidget.  This is a separate class to VideoWidget as both
@@ -62,7 +62,7 @@
 
     \section1 VideoWidgetSurface Class Implementation
 
-    \snippet examples/video/videowidget/videowidgetsurface.cpp 0
+    \snippet examples/multimedia/videowidget/videowidgetsurface.cpp 0
 
     From the supportedPixelFormats() function we return a list of pixel formats
     the surface can paint. The order of the list hints at which formats are
@@ -74,7 +74,7 @@
     return any pixel formats if handleType is not
     QAbstractVideoBuffer::NoHandle.
 
-    \snippet examples/video/videowidget/videowidgetsurface.cpp 1
+    \snippet examples/multimedia/videowidget/videowidgetsurface.cpp 1
 
     In isFormatSupported() we test if the frame type of a surface format maps
     to a valid QImage format, that the frame size is not empty, and the handle
@@ -85,7 +85,7 @@
     that the size is not empty so a reimplementation wasn't strictly necessary
     in this case.
 
-    \snippet examples/video/videowidget/videowidgetsurface.cpp 2
+    \snippet examples/multimedia/videowidget/videowidgetsurface.cpp 2
 
     To start our surface we'll extract the image format and size from the
     selected video format and save it for use in the paint() function.  If the
@@ -94,7 +94,7 @@
     by calling QAbstractVideoSurface::start(). Finally since the video size may
     have changed we'll trigger an update of the widget, and video geometry.
 
-    \snippet examples/video/videowidget/videowidgetsurface.cpp 5
+    \snippet examples/multimedia/videowidget/videowidgetsurface.cpp 5
 
     The updateVideoRect() function calculates the region within the widget the
     video occupies.  The \l {QVideoSurfaceFormat::sizeHint()}{size hint} of the
@@ -105,7 +105,7 @@
     size in the center of the widget.  Otherwise we shrink the size maintaining
     the aspect ratio so that it does fit.
 
-    \snippet examples/video/videowidget/videowidgetsurface.cpp 4
+    \snippet examples/multimedia/videowidget/videowidgetsurface.cpp 4
 
     We can't paint from outside a paint event, so when a new frame is received
     in present() we save a reference to it and force an immediate repaint of
@@ -118,7 +118,7 @@
     \l {QAbstractVideoSurface::UnsupportedFormatError}{UnsupportedFormatError}
     on our surface and stop it immediately.
 
-    \snippet examples/video/videowidget/videowidgetsurface.cpp 6
+    \snippet examples/multimedia/videowidget/videowidgetsurface.cpp 6
 
     The paint() function is called by the video widget to paint the current
     video frame.  Before we draw the frame first we'll check the format for
@@ -128,7 +128,7 @@
     construct a new QImage from the current video frame, and draw it to the
     the widget.
 
-    \snippet examples/video/videowidget/videowidgetsurface.cpp 3
+    \snippet examples/multimedia/videowidget/videowidgetsurface.cpp 3
 
     When the surface is stopped we need to release the current frame and
     invalidate the video region.   Then we confirm the surface has been
@@ -141,7 +141,7 @@
     The VideoWidget class uses the VideoWidgetSurface class to implement a
     video widget.
 
-    \snippet examples/video/videowidget/videowidget.h 0
+    \snippet examples/multimedia/videowidget/videowidget.h 0
 
     The VideoWidget QWidget implementation is minimal with just the sizeHint(),
     paintEvent(), and resizeEvent() functions in addition to the constructor,
@@ -149,7 +149,7 @@
 
     \section1 VideoWidget Class Implementation
 
-    \snippet examples/video/videowidget/videowidget.cpp 0
+    \snippet examples/multimedia/videowidget/videowidget.cpp 0
 
     In the VideoWidget constructor we set some flags to speed up re-paints a
     little.  Setting the Qt::WA_NoSystemBackground flag and disabling automatic
@@ -162,17 +162,17 @@
 
     Finally we construct an instance of the VideoWidgetSurface class.
 
-    \snippet examples/video/videowidget/videowidget.cpp 1
+    \snippet examples/multimedia/videowidget/videowidget.cpp 1
 
     In the destructor we simply delete the VideoWidgetSurface instance.
 
-    \snippet examples/video/videowidget/videowidget.cpp 2
+    \snippet examples/multimedia/videowidget/videowidget.cpp 2
 
     We get the size hint for the widget from the video format of the surface
     which is calculated from viewport and pixel aspect ratio of the video
     format.
 
-    \snippet examples/video/videowidget/videowidget.cpp 3
+    \snippet examples/multimedia/videowidget/videowidget.cpp 3
 
     When the video widget receives a paint event we first check if the surface
     is started,  if not then we simply fill the widget with the background
@@ -180,7 +180,7 @@
     by the paint region, before calling paint on the video surface to draw the
     current frame.
 
-    \snippet examples/video/videowidget/videowidget.cpp 4
+    \snippet examples/multimedia/videowidget/videowidget.cpp 4
 
     The resizeEvent() function is reimplemented to trigger an update of the
     video region when the widget is resized.
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index d72f816faa..d6ade228ef 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -806,16 +806,16 @@
     Audio API in Qt applications.
 
     \list
-    \o \l{multimedia/audio/audiodevices}{Audio Devices}
-    \o \l{multimedia/audio/audiooutput}{Audio Output}
-    \o \l{multimedia/audio/audioinput}{Audio Input}
+    \o \l{multimedia/audiodevices}{Audio Devices}
+    \o \l{multimedia/audiooutput}{Audio Output}
+    \o \l{multimedia/audioinput}{Audio Input}
     \endlist
 
     \section1 Video Output
 
     \list
-    \o \l{video/videowidget}{Video Widget}\raisedaster
-    \o \l{video/videographicsitem}{Video Graphics Item}
+    \o \l{multimedia/videowidget}{Video Widget}\raisedaster
+    \o \l{multimedia/videographicsitem}{Video Graphics Item}
     \endlist
 
     \section1 Phonon
diff --git a/examples/examples.pro b/examples/examples.pro
index 7acd67b817..d11e36bf68 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -39,8 +39,7 @@ symbian: SUBDIRS = \
                 xml
 
 contains(QT_CONFIG, multimedia) {
-    SUBDIRS += video
-    !static: SUBDIRS += multimedia
+    SUBDIRS += multimedia
 }
 
 contains(QT_CONFIG, script): SUBDIRS += script
diff --git a/examples/multimedia/audio/audio.pro b/examples/multimedia/audio/audio.pro
deleted file mode 100644
index c64bb34c66..0000000000
--- a/examples/multimedia/audio/audio.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE      = subdirs
-SUBDIRS       = audioinput \
-                audiooutput \
-                audiodevices
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS audio.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio
-INSTALLS += target sources
diff --git a/examples/multimedia/audio/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp
index 419860518b..419860518b 100644
--- a/examples/multimedia/audio/audiodevices/audiodevices.cpp
+++ b/examples/multimedia/audiodevices/audiodevices.cpp
diff --git a/examples/multimedia/audio/audiodevices/audiodevices.h b/examples/multimedia/audiodevices/audiodevices.h
index 5fe5547d03..5fe5547d03 100644
--- a/examples/multimedia/audio/audiodevices/audiodevices.h
+++ b/examples/multimedia/audiodevices/audiodevices.h
diff --git a/examples/multimedia/audio/audiodevices/audiodevices.pro b/examples/multimedia/audiodevices/audiodevices.pro
index 173aa8f43b..232da098b8 100644
--- a/examples/multimedia/audio/audiodevices/audiodevices.pro
+++ b/examples/multimedia/audiodevices/audiodevices.pro
@@ -6,9 +6,9 @@ FORMS         += audiodevicesbase.ui
 QT           += multimedia
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audiodevices
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiodevices
 sources.files = $$SOURCES *.h $$RESOURCES $$FORMS audiodevices.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audiodevices
+sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiodevices
 INSTALLS += target sources
 
 symbian {
diff --git a/examples/multimedia/audio/audiodevices/audiodevicesbase.ui b/examples/multimedia/audiodevices/audiodevicesbase.ui
index 52073389ab..52073389ab 100644
--- a/examples/multimedia/audio/audiodevices/audiodevicesbase.ui
+++ b/examples/multimedia/audiodevices/audiodevicesbase.ui
diff --git a/examples/multimedia/audio/audiodevices/main.cpp b/examples/multimedia/audiodevices/main.cpp
index d5ddd4f2f5..d5ddd4f2f5 100644
--- a/examples/multimedia/audio/audiodevices/main.cpp
+++ b/examples/multimedia/audiodevices/main.cpp
diff --git a/examples/multimedia/audio/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp
index 05723aea0c..05723aea0c 100644
--- a/examples/multimedia/audio/audioinput/audioinput.cpp
+++ b/examples/multimedia/audioinput/audioinput.cpp
diff --git a/examples/multimedia/audio/audioinput/audioinput.h b/examples/multimedia/audioinput/audioinput.h
index 14e1bacba8..14e1bacba8 100644
--- a/examples/multimedia/audio/audioinput/audioinput.h
+++ b/examples/multimedia/audioinput/audioinput.h
diff --git a/examples/multimedia/audio/audioinput/audioinput.pro b/examples/multimedia/audioinput/audioinput.pro
index 0d6198de86..a54d452d8a 100644
--- a/examples/multimedia/audio/audioinput/audioinput.pro
+++ b/examples/multimedia/audioinput/audioinput.pro
@@ -5,9 +5,9 @@ SOURCES       = audioinput.cpp \
 QT           += multimedia
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audioinput
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audioinput
 sources.files = $$SOURCES *.h $$RESOURCES $$FORMS audioinput.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audioinput
+sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audioinput
 INSTALLS += target sources
 
 symbian {
diff --git a/examples/multimedia/audio/audioinput/main.cpp b/examples/multimedia/audioinput/main.cpp
index d7e9c6c802..d7e9c6c802 100644
--- a/examples/multimedia/audio/audioinput/main.cpp
+++ b/examples/multimedia/audioinput/main.cpp
diff --git a/examples/multimedia/audio/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp
index 9e532cdef7..9e532cdef7 100644
--- a/examples/multimedia/audio/audiooutput/audiooutput.cpp
+++ b/examples/multimedia/audiooutput/audiooutput.cpp
diff --git a/examples/multimedia/audio/audiooutput/audiooutput.h b/examples/multimedia/audiooutput/audiooutput.h
index 6c07a3a6e1..6c07a3a6e1 100644
--- a/examples/multimedia/audio/audiooutput/audiooutput.h
+++ b/examples/multimedia/audiooutput/audiooutput.h
diff --git a/examples/multimedia/audio/audiooutput/audiooutput.pro b/examples/multimedia/audiooutput/audiooutput.pro
index b43763cf00..26f68fe3b2 100644
--- a/examples/multimedia/audio/audiooutput/audiooutput.pro
+++ b/examples/multimedia/audiooutput/audiooutput.pro
@@ -5,9 +5,9 @@ SOURCES       = audiooutput.cpp \
 QT           += multimedia
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audiooutput
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiooutput
 sources.files = $$SOURCES *.h $$RESOURCES $$FORMS audiooutput.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audio/audiooutput
+sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiooutput
 INSTALLS += target sources
 
 symbian {
diff --git a/examples/multimedia/audio/audiooutput/main.cpp b/examples/multimedia/audiooutput/main.cpp
index 79ec99eb64..79ec99eb64 100644
--- a/examples/multimedia/audio/audiooutput/main.cpp
+++ b/examples/multimedia/audiooutput/main.cpp
diff --git a/examples/multimedia/multimedia.pro b/examples/multimedia/multimedia.pro
index ac78b15b47..4a764f2151 100644
--- a/examples/multimedia/multimedia.pro
+++ b/examples/multimedia/multimedia.pro
@@ -1,5 +1,15 @@
-TEMPLATE      = subdirs
-SUBDIRS       = audio
+TEMPLATE = subdirs
+
+!static {
+    SUBDIRS += \
+        audiodevices \
+        audioinput \
+        audiooutput
+}
+
+SUBDIRS += \
+    videographicsitem \
+    videowidget
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/multimedia
diff --git a/examples/video/videographicsitem/main.cpp b/examples/multimedia/videographicsitem/main.cpp
index 3bf4c6d67c..3bf4c6d67c 100644
--- a/examples/video/videographicsitem/main.cpp
+++ b/examples/multimedia/videographicsitem/main.cpp
diff --git a/examples/video/videographicsitem/videographicsitem.pro b/examples/multimedia/videographicsitem/videographicsitem.pro
index d79c3fb275..7c118ccd60 100644
--- a/examples/video/videographicsitem/videographicsitem.pro
+++ b/examples/multimedia/videographicsitem/videographicsitem.pro
@@ -10,9 +10,9 @@ SOURCES   += main.cpp \
              videoitem.cpp
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/video/videographicsitem
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/videographicsitem
 sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png images
-sources.path = $$[QT_INSTALL_EXAMPLES]/video/videographicsitem
+sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/videographicsitem
 INSTALLS += target sources
 
 symbian {
diff --git a/examples/video/videographicsitem/videoitem.cpp b/examples/multimedia/videographicsitem/videoitem.cpp
index c95e33591b..c95e33591b 100644
--- a/examples/video/videographicsitem/videoitem.cpp
+++ b/examples/multimedia/videographicsitem/videoitem.cpp
diff --git a/examples/video/videographicsitem/videoitem.h b/examples/multimedia/videographicsitem/videoitem.h
index 96f578acdd..96f578acdd 100644
--- a/examples/video/videographicsitem/videoitem.h
+++ b/examples/multimedia/videographicsitem/videoitem.h
diff --git a/examples/video/videographicsitem/videoplayer.cpp b/examples/multimedia/videographicsitem/videoplayer.cpp
index 83644db7d5..83644db7d5 100644
--- a/examples/video/videographicsitem/videoplayer.cpp
+++ b/examples/multimedia/videographicsitem/videoplayer.cpp
diff --git a/examples/video/videographicsitem/videoplayer.h b/examples/multimedia/videographicsitem/videoplayer.h
index 8e73e4ccf1..8e73e4ccf1 100644
--- a/examples/video/videographicsitem/videoplayer.h
+++ b/examples/multimedia/videographicsitem/videoplayer.h
diff --git a/examples/video/videowidget/main.cpp b/examples/multimedia/videowidget/main.cpp
index f5edf73e4f..f5edf73e4f 100644
--- a/examples/video/videowidget/main.cpp
+++ b/examples/multimedia/videowidget/main.cpp
diff --git a/examples/video/videowidget/videoplayer.cpp b/examples/multimedia/videowidget/videoplayer.cpp
index ed24714994..ed24714994 100644
--- a/examples/video/videowidget/videoplayer.cpp
+++ b/examples/multimedia/videowidget/videoplayer.cpp
diff --git a/examples/video/videowidget/videoplayer.h b/examples/multimedia/videowidget/videoplayer.h
index 65474152f2..65474152f2 100644
--- a/examples/video/videowidget/videoplayer.h
+++ b/examples/multimedia/videowidget/videoplayer.h
diff --git a/examples/video/videowidget/videowidget.cpp b/examples/multimedia/videowidget/videowidget.cpp
index 80688e1998..80688e1998 100644
--- a/examples/video/videowidget/videowidget.cpp
+++ b/examples/multimedia/videowidget/videowidget.cpp
diff --git a/examples/video/videowidget/videowidget.h b/examples/multimedia/videowidget/videowidget.h
index 8c343bf0c7..8c343bf0c7 100644
--- a/examples/video/videowidget/videowidget.h
+++ b/examples/multimedia/videowidget/videowidget.h
diff --git a/examples/video/videowidget/videowidget.pro b/examples/multimedia/videowidget/videowidget.pro
index 4a1d717c5f..3f93745584 100644
--- a/examples/video/videowidget/videowidget.pro
+++ b/examples/multimedia/videowidget/videowidget.pro
@@ -13,6 +13,12 @@ SOURCES = \
     videowidget.cpp \
     videowidgetsurface.cpp
 
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/videowidget
+sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png images
+sources.path = $$[QT_INSTALL_EXAMPLES]/multimedia/videowidget
+INSTALLS += target sources
+
 symbian {
     TARGET.UID3 = 0xA000D7C3
     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
diff --git a/examples/video/videowidget/videowidgetsurface.cpp b/examples/multimedia/videowidget/videowidgetsurface.cpp
index ec9b8b5600..ec9b8b5600 100644
--- a/examples/video/videowidget/videowidgetsurface.cpp
+++ b/examples/multimedia/videowidget/videowidgetsurface.cpp
diff --git a/examples/video/videowidget/videowidgetsurface.h b/examples/multimedia/videowidget/videowidgetsurface.h
index 83439d303e..83439d303e 100644
--- a/examples/video/videowidget/videowidgetsurface.h
+++ b/examples/multimedia/videowidget/videowidgetsurface.h
diff --git a/examples/video/video.pro b/examples/video/video.pro
deleted file mode 100644
index f0b63b6d00..0000000000
--- a/examples/video/video.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \
-    videographicsitem \
-    videowidget
-