Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	sync.profile

Change-Id: I450b86e3d01498aca12fe11a28527a296f2cbc3f

528 files changed, 1229 insertions, 1372 deletions

diff --git a/.gitignore b/.gitignore
index 3c1e1d309..464f18145 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,6 @@ src/multimediawidgets/qtmultimediawidgetsversion.h
 tst_*
 !tst_*.cpp
 tests/auto/cmake/build
+
+# Generated static plugin import sources
+*_plugin_import.cpp
diff --git a/.qmake.conf b/.qmake.conf
index 42ba8e45f..5de255cb6 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1 +1,2 @@
 load(qt_build_config)
+CONFIG += qt_example_installs
diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1
new file mode 100644
index 000000000..cc5a6704b
--- /dev/null
+++ b/dist/changes-5.0.1
@@ -0,0 +1,51 @@
+Qt 5.0.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.0.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.0/
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+Third party components
+----------------------
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
diff --git a/examples/audiodecoder/audiodecoder.pro b/examples/audiodecoder/audiodecoder.pro
deleted file mode 100644
index 3c238daa8..000000000
--- a/examples/audiodecoder/audiodecoder.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-TEMPLATE = app
-TARGET = audiodecoder
-
-CONFIG += qt warn_on
-
-HEADERS = \
-    audiodecoder.h \
-    wavefilewriter.h
-SOURCES = main.cpp \
-    audiodecoder.cpp \
-    wavefilewriter.cpp
-
-QT += multimedia
-CONFIG += console
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiodecoder
-sources.files = $$SOURCES $$HEADERS audiodecoder.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiodecoder
-INSTALLS += target sources
diff --git a/examples/audiodevices/audiodevices.pro b/examples/audiodevices/audiodevices.pro
deleted file mode 100644
index 7bd598762..000000000
--- a/examples/audiodevices/audiodevices.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-TEMPLATE = app
-TARGET = audiodevices
-
-QT += multimedia
-
-HEADERS       = audiodevices.h
-
-SOURCES       = audiodevices.cpp \
-                main.cpp
-
-FORMS        += audiodevicesbase.ui
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiodevices
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiodevices
-
-INSTALLS += target sources
-
-QT+=widgets
diff --git a/examples/audioengine/audioengine.pro b/examples/audioengine/audioengine.pro
deleted file mode 100644
index e5e5c8dfc..000000000
--- a/examples/audioengine/audioengine.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = subdirs
-
-# These examples contain no C++ and can simply be copied
-SUBDIRS =
-sources.files = doc qml
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audioengine
-INSTALLS += sources
-
-OTHER_FILES += qml/*.qml qml/*.qmlproject qml/content/*
-
diff --git a/examples/audioinput/audioinput.pro b/examples/audioinput/audioinput.pro
deleted file mode 100644
index d2ee4bd90..000000000
--- a/examples/audioinput/audioinput.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-TEMPLATE = app
-TARGET = audioinput
-
-QT += multimedia widgets
-
-HEADERS       = audioinput.h
-
-SOURCES       = audioinput.cpp \
-                main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audioinput
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audioinput
-
-INSTALLS += target sources
diff --git a/examples/audiooutput/audiooutput.pro b/examples/audiooutput/audiooutput.pro
deleted file mode 100644
index 70aad8979..000000000
--- a/examples/audiooutput/audiooutput.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-TEMPLATE = app
-TARGET = audiooutput
-
-QT += multimedia widgets
-
-HEADERS       = audiooutput.h
-
-SOURCES       = audiooutput.cpp \
-                main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiooutput
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiooutput
-
-INSTALLS += target sources
diff --git a/examples/customvideosurface/customvideosurface.pro b/examples/customvideosurface/customvideosurface.pro
deleted file mode 100644
index 2e0e798e9..000000000
--- a/examples/customvideosurface/customvideosurface.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += customvideoitem customvideowidget
-
-# install
-sources.files = customvideosurface.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideosurface
-INSTALLS += sources
diff --git a/examples/customvideosurface/customvideowidget/customvideowidget.pro b/examples/customvideosurface/customvideowidget/customvideowidget.pro
deleted file mode 100644
index 6f4d005c6..000000000
--- a/examples/customvideosurface/customvideowidget/customvideowidget.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-TEMPLATE = app
-TARGET = customvideowidget
-
-QT += multimedia multimediawidgets widgets
-
-HEADERS = \
-    videoplayer.h \
-    videowidget.h \
-    videowidgetsurface.h
-
-SOURCES = \
-    main.cpp \
-    videoplayer.cpp \
-    videowidget.cpp \
-    videowidgetsurface.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideosurface/customvideowidget
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideosurface/customvideowidget
-
-INSTALLS += target sources
diff --git a/examples/declarative-camera/declarative-camera.pro b/examples/declarative-camera/declarative-camera.pro
deleted file mode 100644
index 54d6f392e..000000000
--- a/examples/declarative-camera/declarative-camera.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE=app
-TARGET=declarative-camera
-
-QT += quick qml multimedia
-
-SOURCES += qmlcamera.cpp
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/declarative-camera
-sources.files = $$SOURCES *.pro images *.qml
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/declarative-camera
-INSTALLS += target sources
-
diff --git a/examples/declarative-radio/declarative-radio.pro b/examples/declarative-radio/declarative-radio.pro
deleted file mode 100644
index e536393d7..000000000
--- a/examples/declarative-radio/declarative-radio.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-QT += qml quick multimedia
-
-SOURCES += main.cpp
-RESOURCES += declarative-radio.qrc
-
-OTHER_FILES += view.qml
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/declarative-radio
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro doc view.qml
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/declarative-radio
-INSTALLS += target sources
diff --git a/examples/examples.pro b/examples/examples.pro
index cf9dae1b3..979671672 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,31 +1,3 @@
 TEMPLATE = subdirs
-
-SUBDIRS += audiodecoder
-
-# These examples all need widgets for now (using creator templates that use widgets)
-!isEmpty(QT.widgets.name) {
-    SUBDIRS += \
-        radio \
-        camera \
-        spectrum \
-        audiorecorder \
-        audiodevices \
-        audioinput \
-        audiooutput \
-        videographicsitem \
-        videowidget \
-        player \
-        customvideosurface
-
-    QT += widgets
-}
-
-!isEmpty(QT.gui.name):!isEmpty(QT.qml.name) {
-    disabled:SUBDIRS += declarative-camera
-    SUBDIRS += \
-        declarative-radio \
-        video
-}
-
-config_openal: SUBDIRS += audioengine
+SUBDIRS += multimedia multimediawidgets
 
diff --git a/examples/audiodecoder/audiodecoder.cpp b/examples/multimedia/audiodecoder/audiodecoder.cpp
index 1505a881e..1505a881e 100644
--- a/examples/audiodecoder/audiodecoder.cpp
+++ b/examples/multimedia/audiodecoder/audiodecoder.cpp
diff --git a/examples/audiodecoder/audiodecoder.h b/examples/multimedia/audiodecoder/audiodecoder.h
index 210142de1..210142de1 100644
--- a/examples/audiodecoder/audiodecoder.h
+++ b/examples/multimedia/audiodecoder/audiodecoder.h
diff --git a/examples/multimedia/audiodecoder/audiodecoder.pro b/examples/multimedia/audiodecoder/audiodecoder.pro
new file mode 100644
index 000000000..4cfb31339
--- /dev/null
+++ b/examples/multimedia/audiodecoder/audiodecoder.pro
@@ -0,0 +1,15 @@
+TEMPLATE = app
+TARGET = audiodecoder
+
+HEADERS = \
+    audiodecoder.h \
+    wavefilewriter.h
+SOURCES = main.cpp \
+    audiodecoder.cpp \
+    wavefilewriter.cpp
+
+QT += multimedia
+CONFIG += console
+
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiodecoder
+INSTALLS += target
diff --git a/examples/audiodecoder/main.cpp b/examples/multimedia/audiodecoder/main.cpp
index fabdae9f6..fabdae9f6 100644
--- a/examples/audiodecoder/main.cpp
+++ b/examples/multimedia/audiodecoder/main.cpp
diff --git a/examples/audiodecoder/wavefilewriter.cpp b/examples/multimedia/audiodecoder/wavefilewriter.cpp
index e13476ddd..e13476ddd 100644
--- a/examples/audiodecoder/wavefilewriter.cpp
+++ b/examples/multimedia/audiodecoder/wavefilewriter.cpp
diff --git a/examples/audiodecoder/wavefilewriter.h b/examples/multimedia/audiodecoder/wavefilewriter.h
index 180d34ee7..180d34ee7 100644
--- a/examples/audiodecoder/wavefilewriter.h
+++ b/examples/multimedia/audiodecoder/wavefilewriter.h
diff --git a/examples/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp
index 2892e981f..2892e981f 100644
--- a/examples/audiodevices/audiodevices.cpp
+++ b/examples/multimedia/audiodevices/audiodevices.cpp
diff --git a/examples/audiodevices/audiodevices.h b/examples/multimedia/audiodevices/audiodevices.h
index d1a1cd2cd..d1a1cd2cd 100644
--- a/examples/audiodevices/audiodevices.h
+++ b/examples/multimedia/audiodevices/audiodevices.h
diff --git a/examples/multimedia/audiodevices/audiodevices.pro b/examples/multimedia/audiodevices/audiodevices.pro
new file mode 100644
index 000000000..71701543e
--- /dev/null
+++ b/examples/multimedia/audiodevices/audiodevices.pro
@@ -0,0 +1,16 @@
+TEMPLATE = app
+TARGET = audiodevices
+
+QT += multimedia
+
+HEADERS       = audiodevices.h
+
+SOURCES       = audiodevices.cpp \
+                main.cpp
+
+FORMS        += audiodevicesbase.ui
+
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiodevices
+INSTALLS += target
+
+QT+=widgets
diff --git a/examples/audiodevices/audiodevicesbase.ui b/examples/multimedia/audiodevices/audiodevicesbase.ui
index 5a4ef2da3..5a4ef2da3 100644
--- a/examples/audiodevices/audiodevicesbase.ui
+++ b/examples/multimedia/audiodevices/audiodevicesbase.ui
diff --git a/examples/audiodevices/doc/images/audiodevices.png b/examples/multimedia/audiodevices/doc/images/audiodevices.png
index 419b40f48..419b40f48 100644
--- a/examples/audiodevices/doc/images/audiodevices.png
+++ b/examples/multimedia/audiodevices/doc/images/audiodevices.png
diff --git a/examples/audiodevices/doc/src/audiodevices.qdoc b/examples/multimedia/audiodevices/doc/src/audiodevices.qdoc
index d2522f3ae..af51e373f 100644
--- a/examples/audiodevices/doc/src/audiodevices.qdoc
+++ b/examples/multimedia/audiodevices/doc/src/audiodevices.qdoc
@@ -26,9 +26,9 @@
 ****************************************************************************/
 
 /*!
-    \example audiodevices
+    \example multimedia/audiodevices
     \title Audio Devices Example
-    \ingroup audio_examples
+    \ingroup multimedia_examples
     \brief The Audio Devices example shows the application of the audio devices APIs
 
 
diff --git a/examples/audiodevices/main.cpp b/examples/multimedia/audiodevices/main.cpp
index 525a8cca7..525a8cca7 100644
--- a/examples/audiodevices/main.cpp
+++ b/examples/multimedia/audiodevices/main.cpp
diff --git a/examples/multimedia/audioengine/audioengine.pro b/examples/multimedia/audioengine/audioengine.pro
new file mode 100644
index 000000000..84bc492bc
--- /dev/null
+++ b/examples/multimedia/audioengine/audioengine.pro
@@ -0,0 +1,6 @@
+TEMPLATE = subdirs
+
+# These examples contain no C++ and can simply be copied
+SUBDIRS =
+EXAMPLE_FILES = qml
+
diff --git a/examples/audioengine/doc/src/audioengine.qdoc b/examples/multimedia/audioengine/doc/src/audioengine.qdoc
index bea4d4b57..ba2f17c52 100644
--- a/examples/audioengine/doc/src/audioengine.qdoc
+++ b/examples/multimedia/audioengine/doc/src/audioengine.qdoc
@@ -26,9 +26,9 @@
 ****************************************************************************/
 
 /*!
-    \example audioengine
+    \example multimedia/audioengine
     \title AudioEngine Example
-    \ingroup audioengine_examples
+    \ingroup multimedia_examples
     \brief The Audio Engine example demonstrates 3D sound control using
     the QtAudioEngine API.
 
diff --git a/examples/audioengine/qml/audioengine.qml b/examples/multimedia/audioengine/qml/audioengine.qml
index 3e6fac03b..3e6fac03b 100644
--- a/examples/audioengine/qml/audioengine.qml
+++ b/examples/multimedia/audioengine/qml/audioengine.qml
diff --git a/examples/audioengine/qml/audioengine.qmlproject b/examples/multimedia/audioengine/qml/audioengine.qmlproject
index 15b002b1a..15b002b1a 100644
--- a/examples/audioengine/qml/audioengine.qmlproject
+++ b/examples/multimedia/audioengine/qml/audioengine.qmlproject
diff --git a/examples/audioengine/qml/content/MyAudioEngine.qml b/examples/multimedia/audioengine/qml/content/MyAudioEngine.qml
index 229279b88..229279b88 100644
--- a/examples/audioengine/qml/content/MyAudioEngine.qml
+++ b/examples/multimedia/audioengine/qml/content/MyAudioEngine.qml
diff --git a/examples/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp
index 5aeb1a7a8..5aeb1a7a8 100644
--- a/examples/audioinput/audioinput.cpp
+++ b/examples/multimedia/audioinput/audioinput.cpp
diff --git a/examples/audioinput/audioinput.h b/examples/multimedia/audioinput/audioinput.h
index 83bf66f0d..83bf66f0d 100644
--- a/examples/audioinput/audioinput.h
+++ b/examples/multimedia/audioinput/audioinput.h
diff --git a/examples/multimedia/audioinput/audioinput.pro b/examples/multimedia/audioinput/audioinput.pro
new file mode 100644
index 000000000..b0dc57c27
--- /dev/null
+++ b/examples/multimedia/audioinput/audioinput.pro
@@ -0,0 +1,12 @@
+TEMPLATE = app
+TARGET = audioinput
+
+QT += multimedia widgets
+
+HEADERS       = audioinput.h
+
+SOURCES       = audioinput.cpp \
+                main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audioinput
+INSTALLS += target
diff --git a/examples/audioinput/doc/images/audioinput-example.png b/examples/multimedia/audioinput/doc/images/audioinput-example.png
index fb703e68c..fb703e68c 100644
--- a/examples/audioinput/doc/images/audioinput-example.png
+++ b/examples/multimedia/audioinput/doc/images/audioinput-example.png
diff --git a/examples/audioinput/doc/src/audioinput.qdoc b/examples/multimedia/audioinput/doc/src/audioinput.qdoc
index 4fc7e6e64..ccd4ed269 100644
--- a/examples/audioinput/doc/src/audioinput.qdoc
+++ b/examples/multimedia/audioinput/doc/src/audioinput.qdoc
@@ -26,9 +26,9 @@
 ****************************************************************************/
 
 /*!
-    \example audioinput
+    \example multimedia/audioinput
     \title Audio Input Example
-    \ingroup audio_examples
+    \ingroup multimedia_examples
     \brief The Audio Input Example shows the use of the QAudioInput class.
     The example demonstrates the basic use cases of the QAudioInput class.
 
diff --git a/examples/audioinput/main.cpp b/examples/multimedia/audioinput/main.cpp
index d5dececf1..d5dececf1 100644
--- a/examples/audioinput/main.cpp
+++ b/examples/multimedia/audioinput/main.cpp
diff --git a/examples/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp
index 4328e4e99..4328e4e99 100644
--- a/examples/audiooutput/audiooutput.cpp
+++ b/examples/multimedia/audiooutput/audiooutput.cpp
diff --git a/examples/audiooutput/audiooutput.h b/examples/multimedia/audiooutput/audiooutput.h
index 52c29cc79..52c29cc79 100644
--- a/examples/audiooutput/audiooutput.h
+++ b/examples/multimedia/audiooutput/audiooutput.h
diff --git a/examples/multimedia/audiooutput/audiooutput.pro b/examples/multimedia/audiooutput/audiooutput.pro
new file mode 100644
index 000000000..c843f010f
--- /dev/null
+++ b/examples/multimedia/audiooutput/audiooutput.pro
@@ -0,0 +1,12 @@
+TEMPLATE = app
+TARGET = audiooutput
+
+QT += multimedia widgets
+
+HEADERS       = audiooutput.h
+
+SOURCES       = audiooutput.cpp \
+                main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiooutput
+INSTALLS += target
diff --git a/examples/audiooutput/doc/images/audiooutput-example.png b/examples/multimedia/audiooutput/doc/images/audiooutput-example.png
index 5588fbb57..5588fbb57 100755
--- a/examples/audiooutput/doc/images/audiooutput-example.png
+++ b/examples/multimedia/audiooutput/doc/images/audiooutput-example.png
diff --git a/examples/audiooutput/doc/src/audiooutput.qdoc b/examples/multimedia/audiooutput/doc/src/audiooutput.qdoc
index c29fcd81d..91c735fa6 100644
--- a/examples/audiooutput/doc/src/audiooutput.qdoc
+++ b/examples/multimedia/audiooutput/doc/src/audiooutput.qdoc
@@ -26,9 +26,9 @@
 ****************************************************************************/
 
 /*!
-    \example audiooutput
+    \example multimedia/audiooutput
     \title Audio Output Example
-    \ingroup audio_examples
+    \ingroup multimedia_examples
     \brief The Audio Output Example show the use of the QAudioOutput API.
 
     The example demonstrates the basic use cases of the QAudioOutput class.
diff --git a/examples/audiooutput/main.cpp b/examples/multimedia/audiooutput/main.cpp
index 097cabb7b..097cabb7b 100644
--- a/examples/audiooutput/main.cpp
+++ b/examples/multimedia/audiooutput/main.cpp
diff --git a/examples/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp
index 6c65f2e1d..6c65f2e1d 100644
--- a/examples/audiorecorder/audiorecorder.cpp
+++ b/examples/multimedia/audiorecorder/audiorecorder.cpp
diff --git a/examples/audiorecorder/audiorecorder.h b/examples/multimedia/audiorecorder/audiorecorder.h
index a58daf5f7..a58daf5f7 100644
--- a/examples/audiorecorder/audiorecorder.h
+++ b/examples/multimedia/audiorecorder/audiorecorder.h
diff --git a/examples/audiorecorder/audiorecorder.pro b/examples/multimedia/audiorecorder/audiorecorder.pro
index 7936d951a..6fdc4b13d 100644
--- a/examples/audiorecorder/audiorecorder.pro
+++ b/examples/multimedia/audiorecorder/audiorecorder.pro
@@ -20,10 +20,7 @@ maemo*: {
     FORMS += audiorecorder.ui
 }
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiorecorder
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/audiorecorder
-
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/audiorecorder
+INSTALLS += target
 
 QT+=widgets
diff --git a/examples/audiorecorder/audiorecorder.ui b/examples/multimedia/audiorecorder/audiorecorder.ui
index ff6c2d935..ff6c2d935 100644
--- a/examples/audiorecorder/audiorecorder.ui
+++ b/examples/multimedia/audiorecorder/audiorecorder.ui
diff --git a/examples/audiorecorder/audiorecorder_small.ui b/examples/multimedia/audiorecorder/audiorecorder_small.ui
index 9d23c4267..9d23c4267 100644
--- a/examples/audiorecorder/audiorecorder_small.ui
+++ b/examples/multimedia/audiorecorder/audiorecorder_small.ui
diff --git a/examples/audiorecorder/doc/images/audiorecorder.png b/examples/multimedia/audiorecorder/doc/images/audiorecorder.png
index 6643bf320..6643bf320 100644
--- a/examples/audiorecorder/doc/images/audiorecorder.png
+++ b/examples/multimedia/audiorecorder/doc/images/audiorecorder.png
diff --git a/examples/audiorecorder/doc/src/audiorecorder.qdoc b/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc
index 3dea92cac..df3ce1389 100644
--- a/examples/audiorecorder/doc/src/audiorecorder.qdoc
+++ b/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc
@@ -26,9 +26,9 @@
 ****************************************************************************/
 
 /*!
-    \example audiorecorder
+    \example multimedia/audiorecorder
     \title Audio Recorder Example
-    \ingroup audio_examples
+    \ingroup multimedia_examples
     \brief The Audio Recorder Example shows how to create a simple audio recorder.
 
     It demonstrates the discovery of the supported devices and codecs and the use
@@ -95,10 +95,6 @@
     \code
     ui->statusbar->showMessage(tr("Recorded %1 sec").arg(duration / 1000));
     \endcode
-
-
-
-
 */
 
 
diff --git a/examples/audiorecorder/main.cpp b/examples/multimedia/audiorecorder/main.cpp
index 532cfc86b..532cfc86b 100644
--- a/examples/audiorecorder/main.cpp
+++ b/examples/multimedia/audiorecorder/main.cpp
diff --git a/examples/audiorecorder/qaudiolevel.cpp b/examples/multimedia/audiorecorder/qaudiolevel.cpp
index 1ae034628..1ae034628 100644
--- a/examples/audiorecorder/qaudiolevel.cpp
+++ b/examples/multimedia/audiorecorder/qaudiolevel.cpp
diff --git a/examples/audiorecorder/qaudiolevel.h b/examples/multimedia/audiorecorder/qaudiolevel.h
index 7a9dd07ce..7a9dd07ce 100644
--- a/examples/audiorecorder/qaudiolevel.h
+++ b/examples/multimedia/audiorecorder/qaudiolevel.h
diff --git a/examples/multimedia/declarative-radio/declarative-radio.pro b/examples/multimedia/declarative-radio/declarative-radio.pro
new file mode 100644
index 000000000..68942fa3f
--- /dev/null
+++ b/examples/multimedia/declarative-radio/declarative-radio.pro
@@ -0,0 +1,9 @@
+QT += qml quick multimedia
+
+SOURCES += main.cpp
+RESOURCES += declarative-radio.qrc
+
+EXAMPLE_FILES += view.qml
+
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/declarative-radio
+INSTALLS += target
diff --git a/examples/declarative-radio/declarative-radio.qrc b/examples/multimedia/declarative-radio/declarative-radio.qrc
index ed01a64f6..ed01a64f6 100644
--- a/examples/declarative-radio/declarative-radio.qrc
+++ b/examples/multimedia/declarative-radio/declarative-radio.qrc
diff --git a/examples/declarative-radio/doc/images/declarative-radio-example.png b/examples/multimedia/declarative-radio/doc/images/declarative-radio-example.png
index 6c0393499..6c0393499 100644
--- a/examples/declarative-radio/doc/images/declarative-radio-example.png
+++ b/examples/multimedia/declarative-radio/doc/images/declarative-radio-example.png
diff --git a/examples/declarative-radio/doc/src/declarative-radio.qdoc b/examples/multimedia/declarative-radio/doc/src/declarative-radio.qdoc
index 8b52e6c71..bf3f39ca0 100644
--- a/examples/declarative-radio/doc/src/declarative-radio.qdoc
+++ b/examples/multimedia/declarative-radio/doc/src/declarative-radio.qdoc
@@ -26,10 +26,13 @@
 ****************************************************************************/
 
 /*!
-    \example declarative-radio
+    \example multimedia/declarative-radio
     \title Declarative Radio Example
+    \brief Demonstrates the radio functionality
+    \ingroup multimedia_examples
 
-
+    This examples uses the Qt Multimedia Radio QML type to list the available
+    channels on the FM frequency.
 */
 
 
diff --git a/examples/declarative-radio/main.cpp b/examples/multimedia/declarative-radio/main.cpp
index 09f0e8e88..09f0e8e88 100644
--- a/examples/declarative-radio/main.cpp
+++ b/examples/multimedia/declarative-radio/main.cpp
diff --git a/examples/declarative-radio/view.qml b/examples/multimedia/declarative-radio/view.qml
index 6c59ba66e..6c59ba66e 100644
--- a/examples/declarative-radio/view.qml
+++ b/examples/multimedia/declarative-radio/view.qml
diff --git a/examples/multimedia/multimedia.pro b/examples/multimedia/multimedia.pro
new file mode 100644
index 000000000..85dc4cd95
--- /dev/null
+++ b/examples/multimedia/multimedia.pro
@@ -0,0 +1,23 @@
+TEMPLATE = subdirs
+
+SUBDIRS += audiodecoder
+
+# These examples all need widgets for now (using creator templates that use widgets)
+!isEmpty(QT.widgets.name) {
+    SUBDIRS += \
+        radio \
+        spectrum \
+        audiorecorder \
+        audiodevices \
+        audioinput \
+        audiooutput \
+}
+
+!isEmpty(QT.gui.name):!isEmpty(QT.qml.name) {
+    SUBDIRS += \
+        declarative-radio \
+        video
+}
+
+config_openal: SUBDIRS += audioengine
+
diff --git a/examples/radio/main.cpp b/examples/multimedia/radio/main.cpp
index ff4cef64e..ff4cef64e 100644
--- a/examples/radio/main.cpp
+++ b/examples/multimedia/radio/main.cpp
diff --git a/examples/radio/radio.cpp b/examples/multimedia/radio/radio.cpp
index 24edccf08..24edccf08 100644
--- a/examples/radio/radio.cpp
+++ b/examples/multimedia/radio/radio.cpp
diff --git a/examples/radio/radio.h b/examples/multimedia/radio/radio.h
index f59876633..f59876633 100644
--- a/examples/radio/radio.h
+++ b/examples/multimedia/radio/radio.h
diff --git a/examples/multimedia/radio/radio.pro b/examples/multimedia/radio/radio.pro
new file mode 100644
index 000000000..1b1a35b34
--- /dev/null
+++ b/examples/multimedia/radio/radio.pro
@@ -0,0 +1,16 @@
+TEMPLATE = app
+TARGET = radio
+
+QT += multimedia
+
+HEADERS = \
+    radio.h
+
+SOURCES = \
+    main.cpp \
+    radio.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/radio
+INSTALLS += target
+
+QT+=widgets
diff --git a/examples/spectrum/3rdparty/fftreal/Array.h b/examples/multimedia/spectrum/3rdparty/fftreal/Array.h
index a08e3cf2d..a08e3cf2d 100644
--- a/examples/spectrum/3rdparty/fftreal/Array.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/Array.h
diff --git a/examples/spectrum/3rdparty/fftreal/Array.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/Array.hpp
index 8300077e4..8300077e4 100644
--- a/examples/spectrum/3rdparty/fftreal/Array.hpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/Array.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/DynArray.h b/examples/multimedia/spectrum/3rdparty/fftreal/DynArray.h
index 8041a0c15..8041a0c15 100644
--- a/examples/spectrum/3rdparty/fftreal/DynArray.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/DynArray.h
diff --git a/examples/spectrum/3rdparty/fftreal/DynArray.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/DynArray.hpp
index e62b10f88..e62b10f88 100644
--- a/examples/spectrum/3rdparty/fftreal/DynArray.hpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/DynArray.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/FFTReal.dsp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.dsp
index fe970db08..fe970db08 100644
--- a/examples/spectrum/3rdparty/fftreal/FFTReal.dsp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.dsp
diff --git a/examples/spectrum/3rdparty/fftreal/FFTReal.dsw b/examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.dsw
index 076b0aeb8..076b0aeb8 100644
--- a/examples/spectrum/3rdparty/fftreal/FFTReal.dsw
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.dsw
diff --git a/examples/spectrum/3rdparty/fftreal/FFTReal.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.h
index 9fb272503..9fb272503 100644
--- a/examples/spectrum/3rdparty/fftreal/FFTReal.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.h
diff --git a/examples/spectrum/3rdparty/fftreal/FFTReal.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.hpp
index 335d771dc..335d771dc 100644
--- a/examples/spectrum/3rdparty/fftreal/FFTReal.hpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealFixLen.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLen.h
index 0b8026688..0b8026688 100644
--- a/examples/spectrum/3rdparty/fftreal/FFTRealFixLen.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLen.h
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp
index 6defb0095..6defb0095 100644
--- a/examples/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h
index 163c08323..163c08323 100644
--- a/examples/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassDirect.h
index 7d19c02e4..7d19c02e4 100644
--- a/examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassDirect.h
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp
index db9d568e6..db9d568e6 100644
--- a/examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassInverse.h
index 2de895273..2de895273 100644
--- a/examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassInverse.h
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp
index 573754696..573754696 100644
--- a/examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealSelect.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealSelect.h
index bd722d4d1..bd722d4d1 100644
--- a/examples/spectrum/3rdparty/fftreal/FFTRealSelect.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealSelect.h
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealSelect.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealSelect.hpp
index 9ddf5864c..9ddf5864c 100644
--- a/examples/spectrum/3rdparty/fftreal/FFTRealSelect.hpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealSelect.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h
index c4368ee08..c4368ee08 100644
--- a/examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp
index aa968b81a..aa968b81a 100644
--- a/examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/OscSinCos.h b/examples/multimedia/spectrum/3rdparty/fftreal/OscSinCos.h
index 775fc14f3..775fc14f3 100644
--- a/examples/spectrum/3rdparty/fftreal/OscSinCos.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/OscSinCos.h
diff --git a/examples/spectrum/3rdparty/fftreal/OscSinCos.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/OscSinCos.hpp
index 749aef04d..749aef04d 100644
--- a/examples/spectrum/3rdparty/fftreal/OscSinCos.hpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/OscSinCos.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/TestAccuracy.h b/examples/multimedia/spectrum/3rdparty/fftreal/TestAccuracy.h
index 4b07a6b60..4b07a6b60 100644
--- a/examples/spectrum/3rdparty/fftreal/TestAccuracy.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/TestAccuracy.h
diff --git a/examples/spectrum/3rdparty/fftreal/TestAccuracy.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/TestAccuracy.hpp
index 5c794f747..5c794f747 100644
--- a/examples/spectrum/3rdparty/fftreal/TestAccuracy.hpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/TestAccuracy.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/TestHelperFixLen.h b/examples/multimedia/spectrum/3rdparty/fftreal/TestHelperFixLen.h
index ecff96d33..ecff96d33 100644
--- a/examples/spectrum/3rdparty/fftreal/TestHelperFixLen.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/TestHelperFixLen.h
diff --git a/examples/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp
index 25048b919..25048b919 100644
--- a/examples/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/TestHelperNormal.h b/examples/multimedia/spectrum/3rdparty/fftreal/TestHelperNormal.h
index a7bff5c2e..a7bff5c2e 100644
--- a/examples/spectrum/3rdparty/fftreal/TestHelperNormal.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/TestHelperNormal.h
diff --git a/examples/spectrum/3rdparty/fftreal/TestHelperNormal.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/TestHelperNormal.hpp
index e037696ae..e037696ae 100644
--- a/examples/spectrum/3rdparty/fftreal/TestHelperNormal.hpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/TestHelperNormal.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/TestSpeed.h b/examples/multimedia/spectrum/3rdparty/fftreal/TestSpeed.h
index 229578182..229578182 100644
--- a/examples/spectrum/3rdparty/fftreal/TestSpeed.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/TestSpeed.h
diff --git a/examples/spectrum/3rdparty/fftreal/TestSpeed.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/TestSpeed.hpp
index e716b2a76..e716b2a76 100644
--- a/examples/spectrum/3rdparty/fftreal/TestSpeed.hpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/TestSpeed.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h b/examples/multimedia/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h
index d815f8e31..d815f8e31 100644
--- a/examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h
diff --git a/examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp
index 13b7eb3e0..13b7eb3e0 100644
--- a/examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/bwins/fftrealu.def b/examples/multimedia/spectrum/3rdparty/fftreal/bwins/fftrealu.def
index 7a7939773..7a7939773 100644
--- a/examples/spectrum/3rdparty/fftreal/bwins/fftrealu.def
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/bwins/fftrealu.def
diff --git a/examples/spectrum/3rdparty/fftreal/def.h b/examples/multimedia/spectrum/3rdparty/fftreal/def.h
index 99c545f53..99c545f53 100644
--- a/examples/spectrum/3rdparty/fftreal/def.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/def.h
diff --git a/examples/spectrum/3rdparty/fftreal/eabi/fftrealu.def b/examples/multimedia/spectrum/3rdparty/fftreal/eabi/fftrealu.def
index f95a44140..f95a44140 100644
--- a/examples/spectrum/3rdparty/fftreal/eabi/fftrealu.def
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/eabi/fftrealu.def
diff --git a/examples/spectrum/3rdparty/fftreal/fftreal.pas b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pas
index ea6375450..ea6375450 100644
--- a/examples/spectrum/3rdparty/fftreal/fftreal.pas
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pas
diff --git a/examples/spectrum/3rdparty/fftreal/fftreal.pro b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro
index 45a21864c..f6abeeb15 100644
--- a/examples/spectrum/3rdparty/fftreal/fftreal.pro
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro
@@ -37,11 +37,8 @@ macx {
     DESTDIR = ../..$${spectrum_build_dir}
 }
 
-# Install
+EXAMPLE_FILES = bwins/fftreal.def eabi/fftreal.def readme.txt license.txt
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum
-sources.files = $$SOURCES $$HEADERS fftreal.pro readme.txt license.txt
-sources.files += bwins/fftreal.def eabi/fftreal.def
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum/3rdparty/fftreal
-INSTALLS += sources target
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/spectrum
+INSTALLS += target
 
diff --git a/examples/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
index ef216cb58..ef216cb58 100644
--- a/examples/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
diff --git a/examples/spectrum/3rdparty/fftreal/fftreal_wrapper.h b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal_wrapper.h
index 9a72fe662..9a72fe662 100644
--- a/examples/spectrum/3rdparty/fftreal/fftreal_wrapper.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal_wrapper.h
diff --git a/examples/spectrum/3rdparty/fftreal/license.txt b/examples/multimedia/spectrum/3rdparty/fftreal/license.txt
index 918fe68ea..918fe68ea 100644
--- a/examples/spectrum/3rdparty/fftreal/license.txt
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/license.txt
diff --git a/examples/spectrum/3rdparty/fftreal/readme.txt b/examples/multimedia/spectrum/3rdparty/fftreal/readme.txt
index 0c5ce162f..0c5ce162f 100644
--- a/examples/spectrum/3rdparty/fftreal/readme.txt
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/readme.txt
diff --git a/examples/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp
index fe1d4245f..fe1d4245f 100644
--- a/examples/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp
diff --git a/examples/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.h b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.h
index ba7a99a46..ba7a99a46 100644
--- a/examples/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.h
diff --git a/examples/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.hpp
index fbd511e25..fbd511e25 100644
--- a/examples/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.hpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/stopwatch/Int64.h b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/Int64.h
index 1e786e255..1e786e255 100644
--- a/examples/spectrum/3rdparty/fftreal/stopwatch/Int64.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/Int64.h
diff --git a/examples/spectrum/3rdparty/fftreal/stopwatch/StopWatch.cpp b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/StopWatch.cpp
index 7795d86d6..7795d86d6 100644
--- a/examples/spectrum/3rdparty/fftreal/stopwatch/StopWatch.cpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/StopWatch.cpp
diff --git a/examples/spectrum/3rdparty/fftreal/stopwatch/StopWatch.h b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/StopWatch.h
index 9cc47e5f2..9cc47e5f2 100644
--- a/examples/spectrum/3rdparty/fftreal/stopwatch/StopWatch.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/StopWatch.h
diff --git a/examples/spectrum/3rdparty/fftreal/stopwatch/StopWatch.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/StopWatch.hpp
index 74482a7a7..74482a7a7 100644
--- a/examples/spectrum/3rdparty/fftreal/stopwatch/StopWatch.hpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/StopWatch.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/stopwatch/def.h b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/def.h
index 81ee6aaa3..81ee6aaa3 100644
--- a/examples/spectrum/3rdparty/fftreal/stopwatch/def.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/def.h
diff --git a/examples/spectrum/3rdparty/fftreal/stopwatch/fnc.h b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/fnc.h
index 055453543..055453543 100644
--- a/examples/spectrum/3rdparty/fftreal/stopwatch/fnc.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/fnc.h
diff --git a/examples/spectrum/3rdparty/fftreal/stopwatch/fnc.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/fnc.hpp
index 0ab5949ef..0ab5949ef 100644
--- a/examples/spectrum/3rdparty/fftreal/stopwatch/fnc.hpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/stopwatch/fnc.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/test.cpp b/examples/multimedia/spectrum/3rdparty/fftreal/test.cpp
index 7b6ed2cab..7b6ed2cab 100644
--- a/examples/spectrum/3rdparty/fftreal/test.cpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/test.cpp
diff --git a/examples/spectrum/3rdparty/fftreal/test_fnc.h b/examples/multimedia/spectrum/3rdparty/fftreal/test_fnc.h
index 262215664..262215664 100644
--- a/examples/spectrum/3rdparty/fftreal/test_fnc.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/test_fnc.h
diff --git a/examples/spectrum/3rdparty/fftreal/test_fnc.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/test_fnc.hpp
index 4b5f9f59e..4b5f9f59e 100644
--- a/examples/spectrum/3rdparty/fftreal/test_fnc.hpp
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/test_fnc.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/test_settings.h b/examples/multimedia/spectrum/3rdparty/fftreal/test_settings.h
index b893afc8d..b893afc8d 100644
--- a/examples/spectrum/3rdparty/fftreal/test_settings.h
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/test_settings.h
diff --git a/examples/spectrum/3rdparty/fftreal/testapp.dpr b/examples/multimedia/spectrum/3rdparty/fftreal/testapp.dpr
index 54f2eb99a..54f2eb99a 100644
--- a/examples/spectrum/3rdparty/fftreal/testapp.dpr
+++ b/examples/multimedia/spectrum/3rdparty/fftreal/testapp.dpr
diff --git a/examples/spectrum/README.txt b/examples/multimedia/spectrum/README.txt
index c39d4a709..c39d4a709 100644
--- a/examples/spectrum/README.txt
+++ b/examples/multimedia/spectrum/README.txt
diff --git a/examples/spectrum/TODO.txt b/examples/multimedia/spectrum/TODO.txt
index 7e5881abf..7e5881abf 100644
--- a/examples/spectrum/TODO.txt
+++ b/examples/multimedia/spectrum/TODO.txt
diff --git a/examples/spectrum/app/.gitignore b/examples/multimedia/spectrum/app/.gitignore
index 82cf2a28f..82cf2a28f 100644
--- a/examples/spectrum/app/.gitignore
+++ b/examples/multimedia/spectrum/app/.gitignore
diff --git a/examples/spectrum/app/app.pro b/examples/multimedia/spectrum/app/app.pro
index 712fafcf0..581848a7f 100644
--- a/examples/spectrum/app/app.pro
+++ b/examples/multimedia/spectrum/app/app.pro
@@ -56,14 +56,8 @@ RESOURCES = spectrum.qrc
     }
 }
 
-# Install
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum
-sources.files = $$SOURCES $$HEADERS $$RESOURCES app.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum/app
-images.files += images/record.png images/settings.png
-images.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum/app/images
-INSTALLS += target sources images
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/spectrum
+INSTALLS += target
 
 # Deployment
 
diff --git a/examples/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp
index 908cb9df6..908cb9df6 100644
--- a/examples/spectrum/app/engine.cpp
+++ b/examples/multimedia/spectrum/app/engine.cpp
diff --git a/examples/spectrum/app/engine.h b/examples/multimedia/spectrum/app/engine.h
index f3ca5c97a..f3ca5c97a 100644
--- a/examples/spectrum/app/engine.h
+++ b/examples/multimedia/spectrum/app/engine.h
diff --git a/examples/spectrum/app/frequencyspectrum.cpp b/examples/multimedia/spectrum/app/frequencyspectrum.cpp
index 6a7fd1fab..6a7fd1fab 100644
--- a/examples/spectrum/app/frequencyspectrum.cpp
+++ b/examples/multimedia/spectrum/app/frequencyspectrum.cpp
diff --git a/examples/spectrum/app/frequencyspectrum.h b/examples/multimedia/spectrum/app/frequencyspectrum.h
index 10843ab39..10843ab39 100644
--- a/examples/spectrum/app/frequencyspectrum.h
+++ b/examples/multimedia/spectrum/app/frequencyspectrum.h
diff --git a/examples/spectrum/app/images/record.png b/examples/multimedia/spectrum/app/images/record.png
index e7493aad9..e7493aad9 100644
--- a/examples/spectrum/app/images/record.png
+++ b/examples/multimedia/spectrum/app/images/record.png
diff --git a/examples/spectrum/app/images/settings.png b/examples/multimedia/spectrum/app/images/settings.png
index 12179dc9a..12179dc9a 100644
--- a/examples/spectrum/app/images/settings.png
+++ b/examples/multimedia/spectrum/app/images/settings.png
diff --git a/examples/spectrum/app/levelmeter.cpp b/examples/multimedia/spectrum/app/levelmeter.cpp
index 2fde9184a..2fde9184a 100644
--- a/examples/spectrum/app/levelmeter.cpp
+++ b/examples/multimedia/spectrum/app/levelmeter.cpp
diff --git a/examples/spectrum/app/levelmeter.h b/examples/multimedia/spectrum/app/levelmeter.h
index 53147ff7b..53147ff7b 100644
--- a/examples/spectrum/app/levelmeter.h
+++ b/examples/multimedia/spectrum/app/levelmeter.h
diff --git a/examples/spectrum/app/main.cpp b/examples/multimedia/spectrum/app/main.cpp
index 7f47beb0c..7f47beb0c 100644
--- a/examples/spectrum/app/main.cpp
+++ b/examples/multimedia/spectrum/app/main.cpp
diff --git a/examples/spectrum/app/mainwidget.cpp b/examples/multimedia/spectrum/app/mainwidget.cpp
index ea1f0ad86..ea1f0ad86 100644
--- a/examples/spectrum/app/mainwidget.cpp
+++ b/examples/multimedia/spectrum/app/mainwidget.cpp
diff --git a/examples/spectrum/app/mainwidget.h b/examples/multimedia/spectrum/app/mainwidget.h
index 971d90381..971d90381 100644
--- a/examples/spectrum/app/mainwidget.h
+++ b/examples/multimedia/spectrum/app/mainwidget.h
diff --git a/examples/spectrum/app/progressbar.cpp b/examples/multimedia/spectrum/app/progressbar.cpp
index 79596cdca..79596cdca 100644
--- a/examples/spectrum/app/progressbar.cpp
+++ b/examples/multimedia/spectrum/app/progressbar.cpp
diff --git a/examples/spectrum/app/progressbar.h b/examples/multimedia/spectrum/app/progressbar.h
index 9ee505d49..9ee505d49 100644
--- a/examples/spectrum/app/progressbar.h
+++ b/examples/multimedia/spectrum/app/progressbar.h
diff --git a/examples/spectrum/app/settingsdialog.cpp b/examples/multimedia/spectrum/app/settingsdialog.cpp
index abca69783..abca69783 100644
--- a/examples/spectrum/app/settingsdialog.cpp
+++ b/examples/multimedia/spectrum/app/settingsdialog.cpp
diff --git a/examples/spectrum/app/settingsdialog.h b/examples/multimedia/spectrum/app/settingsdialog.h
index 0ce114dc9..0ce114dc9 100644
--- a/examples/spectrum/app/settingsdialog.h
+++ b/examples/multimedia/spectrum/app/settingsdialog.h
diff --git a/examples/spectrum/app/spectrograph.cpp b/examples/multimedia/spectrum/app/spectrograph.cpp
index b1785e728..b1785e728 100644
--- a/examples/spectrum/app/spectrograph.cpp
+++ b/examples/multimedia/spectrum/app/spectrograph.cpp
diff --git a/examples/spectrum/app/spectrograph.h b/examples/multimedia/spectrum/app/spectrograph.h
index 470d4e5e2..470d4e5e2 100644
--- a/examples/spectrum/app/spectrograph.h
+++ b/examples/multimedia/spectrum/app/spectrograph.h
diff --git a/examples/spectrum/app/spectrum.h b/examples/multimedia/spectrum/app/spectrum.h
index f79aaa9de..f79aaa9de 100644
--- a/examples/spectrum/app/spectrum.h
+++ b/examples/multimedia/spectrum/app/spectrum.h
diff --git a/examples/spectrum/app/spectrum.qrc b/examples/multimedia/spectrum/app/spectrum.qrc
index 61004791b..61004791b 100644
--- a/examples/spectrum/app/spectrum.qrc
+++ b/examples/multimedia/spectrum/app/spectrum.qrc
diff --git a/examples/spectrum/app/spectrumanalyser.cpp b/examples/multimedia/spectrum/app/spectrumanalyser.cpp
index d3fe5114b..d3fe5114b 100644
--- a/examples/spectrum/app/spectrumanalyser.cpp
+++ b/examples/multimedia/spectrum/app/spectrumanalyser.cpp
diff --git a/examples/spectrum/app/spectrumanalyser.h b/examples/multimedia/spectrum/app/spectrumanalyser.h
index 582d032de..582d032de 100644
--- a/examples/spectrum/app/spectrumanalyser.h
+++ b/examples/multimedia/spectrum/app/spectrumanalyser.h
diff --git a/examples/spectrum/app/tonegenerator.cpp b/examples/multimedia/spectrum/app/tonegenerator.cpp
index 51a1de357..51a1de357 100644
--- a/examples/spectrum/app/tonegenerator.cpp
+++ b/examples/multimedia/spectrum/app/tonegenerator.cpp
diff --git a/examples/spectrum/app/tonegenerator.h b/examples/multimedia/spectrum/app/tonegenerator.h
index 40cfc3d32..40cfc3d32 100644
--- a/examples/spectrum/app/tonegenerator.h
+++ b/examples/multimedia/spectrum/app/tonegenerator.h
diff --git a/examples/spectrum/app/tonegeneratordialog.cpp b/examples/multimedia/spectrum/app/tonegeneratordialog.cpp
index 27c9d0dba..27c9d0dba 100644
--- a/examples/spectrum/app/tonegeneratordialog.cpp
+++ b/examples/multimedia/spectrum/app/tonegeneratordialog.cpp
diff --git a/examples/spectrum/app/tonegeneratordialog.h b/examples/multimedia/spectrum/app/tonegeneratordialog.h
index a38a1f611..a38a1f611 100644
--- a/examples/spectrum/app/tonegeneratordialog.h
+++ b/examples/multimedia/spectrum/app/tonegeneratordialog.h
diff --git a/examples/spectrum/app/utils.cpp b/examples/multimedia/spectrum/app/utils.cpp
index 92e2d6d18..92e2d6d18 100644
--- a/examples/spectrum/app/utils.cpp
+++ b/examples/multimedia/spectrum/app/utils.cpp
diff --git a/examples/spectrum/app/utils.h b/examples/multimedia/spectrum/app/utils.h
index daf5fae8e..daf5fae8e 100644
--- a/examples/spectrum/app/utils.h
+++ b/examples/multimedia/spectrum/app/utils.h
diff --git a/examples/spectrum/app/waveform.cpp b/examples/multimedia/spectrum/app/waveform.cpp
index 3b17f7855..3b17f7855 100644
--- a/examples/spectrum/app/waveform.cpp
+++ b/examples/multimedia/spectrum/app/waveform.cpp
diff --git a/examples/spectrum/app/waveform.h b/examples/multimedia/spectrum/app/waveform.h
index 019e86ac5..019e86ac5 100644
--- a/examples/spectrum/app/waveform.h
+++ b/examples/multimedia/spectrum/app/waveform.h
diff --git a/examples/spectrum/app/wavfile.cpp b/examples/multimedia/spectrum/app/wavfile.cpp
index dc1655c3a..dc1655c3a 100644
--- a/examples/spectrum/app/wavfile.cpp
+++ b/examples/multimedia/spectrum/app/wavfile.cpp
diff --git a/examples/spectrum/app/wavfile.h b/examples/multimedia/spectrum/app/wavfile.h
index 977071366..977071366 100644
--- a/examples/spectrum/app/wavfile.h
+++ b/examples/multimedia/spectrum/app/wavfile.h
diff --git a/examples/spectrum/doc/images/spectrum-demo.png b/examples/multimedia/spectrum/doc/images/spectrum-demo.png
index 9ccb489a9..9ccb489a9 100644
--- a/examples/spectrum/doc/images/spectrum-demo.png
+++ b/examples/multimedia/spectrum/doc/images/spectrum-demo.png
diff --git a/examples/spectrum/doc/src/spectrum.qdoc b/examples/multimedia/spectrum/doc/src/spectrum.qdoc
index 64c6f8364..5e91af439 100644
--- a/examples/spectrum/doc/src/spectrum.qdoc
+++ b/examples/multimedia/spectrum/doc/src/spectrum.qdoc
@@ -26,12 +26,12 @@
 ****************************************************************************/
 
 /*!
-    \example spectrum
+    \example multimedia/spectrum
     \title Spectrum Example
-    \ingroup audio_examples
+    \ingroup multimedia_examples
     \brief The Spectrum Example uses a combination multimedia APIs to process microphone input.
 
-    The Spectrum Analyzer example shows how the \l{QtMultimedia Module} can be
+    The Spectrum Analyzer example shows how the \l{Qt Multimedia} module can be
     used to record and then play back an audio stream.
 
     \image spectrum-demo.png
diff --git a/examples/spectrum/spectrum.pri b/examples/multimedia/spectrum/spectrum.pri
index 75c011311..75c011311 100644
--- a/examples/spectrum/spectrum.pri
+++ b/examples/multimedia/spectrum/spectrum.pri
diff --git a/examples/spectrum/spectrum.pro b/examples/multimedia/spectrum/spectrum.pro
index 0dbb77108..81006a24c 100644
--- a/examples/spectrum/spectrum.pro
+++ b/examples/multimedia/spectrum/spectrum.pro
@@ -4,13 +4,9 @@ TEMPLATE = subdirs
 
 # Ensure that library is built before application
 CONFIG  += ordered
-QT += widgets
 
 !contains(DEFINES, DISABLE_FFT): SUBDIRS += 3rdparty/fftreal
 SUBDIRS += app
 
 TARGET = spectrum
 
-sources.files = README.txt spectrum.pri spectrum.pro TODO.txt
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/spectrum
-INSTALLS += sources
diff --git a/examples/video/doc/images/qmlvideo-menu.png b/examples/multimedia/video/doc/images/qmlvideo-menu.png
index b2d773319..b2d773319 100644
--- a/examples/video/doc/images/qmlvideo-menu.png
+++ b/examples/multimedia/video/doc/images/qmlvideo-menu.png
diff --git a/examples/video/doc/images/qmlvideo-overlay.png b/examples/multimedia/video/doc/images/qmlvideo-overlay.png
index f5dc8390d..f5dc8390d 100644
--- a/examples/video/doc/images/qmlvideo-overlay.png
+++ b/examples/multimedia/video/doc/images/qmlvideo-overlay.png
diff --git a/examples/video/doc/images/qmlvideofx-camera-glow.png b/examples/multimedia/video/doc/images/qmlvideofx-camera-glow.png
index aca874b6c..aca874b6c 100644
--- a/examples/video/doc/images/qmlvideofx-camera-glow.png
+++ b/examples/multimedia/video/doc/images/qmlvideofx-camera-glow.png
diff --git a/examples/video/doc/images/qmlvideofx-camera-magnify.png b/examples/multimedia/video/doc/images/qmlvideofx-camera-magnify.png
index c3156ce96..c3156ce96 100644
--- a/examples/video/doc/images/qmlvideofx-camera-magnify.png
+++ b/examples/multimedia/video/doc/images/qmlvideofx-camera-magnify.png
diff --git a/examples/video/doc/images/qmlvideofx-effects-menu.png b/examples/multimedia/video/doc/images/qmlvideofx-effects-menu.png
index 507fd7384..507fd7384 100644
--- a/examples/video/doc/images/qmlvideofx-effects-menu.png
+++ b/examples/multimedia/video/doc/images/qmlvideofx-effects-menu.png
diff --git a/examples/video/doc/images/qmlvideofx-source-menu.png b/examples/multimedia/video/doc/images/qmlvideofx-source-menu.png
index 661aaa73f..661aaa73f 100644
--- a/examples/video/doc/images/qmlvideofx-source-menu.png
+++ b/examples/multimedia/video/doc/images/qmlvideofx-source-menu.png
diff --git a/examples/video/doc/images/qmlvideofx-video-edgedetection.png b/examples/multimedia/video/doc/images/qmlvideofx-video-edgedetection.png
index cedb314c5..cedb314c5 100644
--- a/examples/video/doc/images/qmlvideofx-video-edgedetection.png
+++ b/examples/multimedia/video/doc/images/qmlvideofx-video-edgedetection.png
diff --git a/examples/video/doc/images/qmlvideofx-video-pagecurl.png b/examples/multimedia/video/doc/images/qmlvideofx-video-pagecurl.png
index 5f5bdfb53..5f5bdfb53 100644
--- a/examples/video/doc/images/qmlvideofx-video-pagecurl.png
+++ b/examples/multimedia/video/doc/images/qmlvideofx-video-pagecurl.png
diff --git a/examples/video/doc/src/qmlvideo.qdoc b/examples/multimedia/video/doc/src/qmlvideo.qdoc
index c27ca1bce..0f4de6ce5 100644
--- a/examples/video/doc/src/qmlvideo.qdoc
+++ b/examples/multimedia/video/doc/src/qmlvideo.qdoc
@@ -26,9 +26,9 @@
 ****************************************************************************/
 
 /*!
-\example video/qmlvideo
+\example multimedia/video/qmlvideo
 \title QML Video Example
-\ingroup video_examples_qml
+\ingroup multimedia_examples
 
 \brief The QML Video Example demonstrates the various manipulations (move;
 resize; rotate; change aspect ratio) which can be applied to QML \l{VideoOutput}
@@ -52,15 +52,15 @@ which moves across the \l{VideoOutput} item.
 
 \section1 Application structure
 
-The \l{video/qmlvideo/qml/qmlvideo/main.qml} file creates a UI which includes
+The \l{multimedia/video/qmlvideo/qml/qmlvideo/main.qml} file creates a UI which includes
 the following items:
 
 \list
-    \li Two \l{video/qmlvideo/qml/qmlvideo/Button.qml}{Button} instances, each
+    \li Two \l{multimedia/video/qmlvideo/qml/qmlvideo/Button.qml}{Button} instances, each
        of which displays a filename, and can be used to launch a
-       \l{video/qmlvideo/qml/qmlvideo/FileBrowser.qml}{FileBrowser}
-    \li An exit \l{video/qmlvideo/qml/qmlvideo/Button.qml}{Button}
-    \li A \l{video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml}{SceneSelectionPanel},
+       \l{multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml}{FileBrowser}
+    \li An exit \l{multimedia/video/qmlvideo/qml/qmlvideo/Button.qml}{Button}
+    \li A \l{multimedia/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml}{SceneSelectionPanel},
        which is a flickable list displaying the available scenes
     \li At the lower left, an item which displays the QML repainting rate - the
        upper number is the instantaneous frame rate and the lower number is the
@@ -72,18 +72,18 @@ the following items:
 Each scene in the flickable list is implemented in its own QML file - for
 example the video-basic scene (which just displays a static \l{VideoOutput}
 in the center of the screen) is implemented in the
-\l{video/qmlvideo/qml/qmlvideo/VideoBasic.qml}{VideoBasic.qml} file.  As you
+\l{multimedia/ideo/qmlvideo/qml/qmlvideo/VideoBasic.qml}{VideoBasic.qml} file.  As you
 can see from the code, this makes use of a type of inheritance: a
-\l{video/qmlvideo/qml/qmlvideo/VideoBasic.qml}{VideoBasic} item ...
+\l{multimedia/video/qmlvideo/qml/qmlvideo/VideoBasic.qml}{VideoBasic} item ...
 
-\quotefromfile video/qmlvideo/qml/qmlvideo/VideoBasic.qml
+\quotefromfile multimedia/video/qmlvideo/qml/qmlvideo/VideoBasic.qml
 \skipto import
 \printuntil /^\}/
 
 ... is-a
-\l{video/qmlvideo/qml/qmlvideo/SceneBasic.qml}{SceneBasic} ...
+\l{multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml}{SceneBasic} ...
 
-\quotefromfile video/qmlvideo/qml/qmlvideo/SceneBasic.qml
+\quotefromfile multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml
 \skipto import
 \printuntil contentType
 \dots
@@ -94,9 +94,9 @@ can see from the code, this makes use of a type of inheritance: a
 \printuntil /^\}/
 
 ... which is-a
-\l{video/qmlvideo/qml/qmlvideo/Scene.qml}{Scene}:
+\l{multimedia/video/qmlvideo/qml/qmlvideo/Scene.qml}{Scene}:
 
-\quotefromfile video/qmlvideo/qml/qmlvideo/Scene.qml
+\quotefromfile multimedia/video/qmlvideo/qml/qmlvideo/Scene.qml
 \skipto import
 \printuntil root
 \dots
@@ -106,36 +106,36 @@ can see from the code, this makes use of a type of inheritance: a
 \skipto Button
 \printuntil /^\}/
 
-\l{video/qmlvideo/qml/qmlvideo/SceneBasic.qml}{SceneBasic} describes the
+\l{multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml}{SceneBasic} describes the
 structure and behaviour of the scene, but is agnostic of the type of content
 which will be displayed - this is abstracted by
-\l{video/qmlvideo/qml/qmlvideo/Content.qml}{Content}.
+\l{multimedia/video/qmlvideo/qml/qmlvideo/Content.qml}{Content}.
 
 This pattern allows us to define a particular use case (in this case, simply
 display a static piece of content), and then instantiate that use case for
 both video content
-(\l{video/qmlvideo/qml/qmlvideo/VideoBasic.qml}{VideoBasic}) and cameracontent
-(\l{video/qmlvideo/qml/qmlvideo/CameraBasic.qml}{CameraBasic}).  This approach
+(\l{multimedia/video/qmlvideo/qml/qmlvideo/VideoBasic.qml}{VideoBasic}) and cameracontent
+(\l{multimedia/video/qmlvideo/qml/qmlvideo/CameraBasic.qml}{CameraBasic}).  This approach
 is used to implement many of the other scenes - for example, "repeatedly slide
 the content from left to right and back again" is implemented by
-\l{video/qmlvideo/qml/qmlvideo/SceneMove.qml}{SceneMove}, on which
-\l{video/qmlvideo/qml/qmlvideo/VideoMove.qml}{VideoMove} and
-\l{video/qmlvideo/qml/qmlvideo/CameraMove.qml}{CameraMove} are based.
+\l{multimedia/video/qmlvideo/qml/qmlvideo/SceneMove.qml}{SceneMove}, on which
+\l{multimedia/video/qmlvideo/qml/qmlvideo/VideoMove.qml}{VideoMove} and
+\l{multimedia/video/qmlvideo/qml/qmlvideo/CameraMove.qml}{CameraMove} are based.
 
 Depending on the value of the contentType property in the top-level scene
 instance, the embedded
-\l{video/qmlvideo/qml/qmlvideo/Content.qml}{Content} item creates either a
+\l{multimedia/video/qmlvideo/qml/qmlvideo/Content.qml}{Content} item creates either a
 \l{MediaPlayer} or a \l{Camera} item.
 
 \section1 Calculating and displaying QML painting rate
 
-\input examples/video-qml-paint-rate.qdocinc
+\input multimedia/doc/src/examples/video-qml-paint-rate.qdocinc
 
 All that remains is to connect the afterRendering() signal of the QQuickView
 object to a JavaScript function, which will eventually call frequencyItem.notify():
 
-\quotefromfile video/qmlvideo/main.cpp
-\skipto QmlApplicationViewer
+\quotefromfile multimedia/video/qmlvideo/main.cpp
+\skipto QGuiApplication
 \printuntil ;
 \dots
 \skipto QQuickItem
diff --git a/examples/video/doc/src/qmlvideofx.qdoc b/examples/multimedia/video/doc/src/qmlvideofx.qdoc
index f9b324087..a3b7c01a2 100644
--- a/examples/video/doc/src/qmlvideofx.qdoc
+++ b/examples/multimedia/video/doc/src/qmlvideofx.qdoc
@@ -26,10 +26,9 @@
 ****************************************************************************/
 
 /*!
-\example video/qmlvideofx
+\example multimedia/video/qmlvideofx
 \title QML Video Shader Effects Example
-\ingroup video_examples_qml
-\ingroup camera_examples_qml
+\ingroup multimedia_examples
 
 \brief The QML Video Shader Effects Example shows how \l {ShaderEffect}
 can be used to apply postprocessing effects, expressed in \c GLSL, to video
@@ -135,10 +134,10 @@ types is a bit more complicated, for the following reasons:
 \endlist
 
 The abstraction of source item type is achieved by the
-\l{video/qmlvideofx/qml/qmlvideofx/Content.qml}{Content}, which uses a
+\l{multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml}{Content}, which uses a
 \l{Loader} to create either a \l{MediaPlayer}, \l{Camera} or \l{Image}:
 
-\quotefromfile video/qmlvideofx/qml/qmlvideofx/Content.qml
+\quotefromfile multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml
 \skipto import
 \printuntil {
 \dots
@@ -165,10 +164,10 @@ The abstraction of source item type is achieved by the
 \printuntil }
 
 Each effect is implemented as a QML item which is based on the
-\l{video/qmlvideofx/qml/qmlvideofx/Effect.qml}{Effect}, which in turn
+\l{multimedia/video/qmlvideofx/qml/qmlvideofx/Effect.qml}{Effect}, which in turn
 is based on the \l{ShaderEffect}:
 
-\quotefromfile video/qmlvideofx/qml/qmlvideofx/Effect.qml
+\quotefromfile multimedia/video/qmlvideofx/qml/qmlvideofx/Effect.qml
 \skipto import
 \printuntil /^\}/
 
@@ -180,20 +179,20 @@ implementation of the pixelation effect.  As you can see, the pixelation effect
 supports one parameter (which controls the pixelation granularity), and states
 that the divider should be displayed.
 
-\quotefromfile video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml
+\quotefromfile multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml
 \skipto import
 \printuntil /^\}/
 
 The main.qml file shows a
-\l{video/qmlvideofx/qml/qmlvideofx/FileOpen.qml}{FileOpen}, which allows
+\l{multimedia/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml}{FileOpen}, which allows
 the user to select the input source and an
-\l{video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml}{EffectSelectionPanel}
+\l{multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml}{EffectSelectionPanel}
 item, which lists each of the available shader effects.  As described above, a
-\l{video/qmlvideofx/qml/qmlvideofx/Content.qml}{Content} item is used to load the
+\l{multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml}{Content} item is used to load the
 appropriate input and effect type.  A
-\l{video/qmlvideofx/qml/qmlvideofx/Divider.qml}{Divider} item draws the
+\l{multimedia/video/qmlvideofx/qml/qmlvideofx/Divider.qml}{Divider} item draws the
 vertical dividing line, which can be dragged left / right by the user.  Finally,
-a \l{video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml}{ParameterPanel} item
+a \l{multimedia/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml}{ParameterPanel} item
 renders the sliders corresponding to each effect parameter.
 
 Here is the source selection menu:
@@ -204,13 +203,13 @@ And here is the effect selection menu:
 
 \section1 Calculating and displaying QML painting rate
 
-\input examples/video-qml-paint-rate.qdocinc
+\input multimedia/doc/src/examples/video-qml-paint-rate.qdocinc
 
 All that remains is to connect the afterRendering() signal of the QQuickView
 object to a JavaScript function, which will eventually call frequencyItem.notify():
 
-\quotefromfile video/qmlvideofx/main.cpp
-\skipto QmlApplicationViewer
+\quotefromfile multimedia/video/qmlvideofx/main.cpp
+\skipto QGuiApplication
 \printuntil ;
 \dots
 \skipto QQuickItem
diff --git a/examples/video/qmlvideo/images/close.png b/examples/multimedia/video/qmlvideo/images/close.png
index 6904df0e4..6904df0e4 100644
--- a/examples/video/qmlvideo/images/close.png
+++ b/examples/multimedia/video/qmlvideo/images/close.png
diff --git a/examples/video/qmlvideo/images/folder.png b/examples/multimedia/video/qmlvideo/images/folder.png
index e53e2ad46..e53e2ad46 100644
--- a/examples/video/qmlvideo/images/folder.png
+++ b/examples/multimedia/video/qmlvideo/images/folder.png
diff --git a/examples/video/qmlvideo/images/leaves.jpg b/examples/multimedia/video/qmlvideo/images/leaves.jpg
index 66533b34a..66533b34a 100644
--- a/examples/video/qmlvideo/images/leaves.jpg
+++ b/examples/multimedia/video/qmlvideo/images/leaves.jpg
diff --git a/examples/video/qmlvideo/images/progress_handle.svg b/examples/multimedia/video/qmlvideo/images/progress_handle.svg
index 7ad9014e3..7ad9014e3 100644
--- a/examples/video/qmlvideo/images/progress_handle.svg
+++ b/examples/multimedia/video/qmlvideo/images/progress_handle.svg
diff --git a/examples/video/qmlvideo/images/progress_handle_pressed.svg b/examples/multimedia/video/qmlvideo/images/progress_handle_pressed.svg
index c9c6c486c..c9c6c486c 100644
--- a/examples/video/qmlvideo/images/progress_handle_pressed.svg
+++ b/examples/multimedia/video/qmlvideo/images/progress_handle_pressed.svg
diff --git a/examples/video/qmlvideo/images/titlebar.png b/examples/multimedia/video/qmlvideo/images/titlebar.png
index 51c90082d..51c90082d 100644
--- a/examples/video/qmlvideo/images/titlebar.png
+++ b/examples/multimedia/video/qmlvideo/images/titlebar.png
diff --git a/examples/video/qmlvideo/images/titlebar.sci b/examples/multimedia/video/qmlvideo/images/titlebar.sci
index 0418d94cd..0418d94cd 100644
--- a/examples/video/qmlvideo/images/titlebar.sci
+++ b/examples/multimedia/video/qmlvideo/images/titlebar.sci
diff --git a/examples/video/qmlvideo/images/up.png b/examples/multimedia/video/qmlvideo/images/up.png
index b05f8025d..b05f8025d 100644
--- a/examples/video/qmlvideo/images/up.png
+++ b/examples/multimedia/video/qmlvideo/images/up.png
diff --git a/examples/video/qmlvideo/main.cpp b/examples/multimedia/video/qmlvideo/main.cpp
index 149fc7a85..ac26c983a 100644
--- a/examples/video/qmlvideo/main.cpp
+++ b/examples/multimedia/video/qmlvideo/main.cpp
@@ -43,9 +43,10 @@
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtQml/QQmlContext>
+#include <QtQml/QQmlEngine>
 #include <QtGui/QGuiApplication>
 #include <QtQuick/QQuickItem>
-#include "qmlapplicationviewer.h"
+#include <QtQuick/QQuickView>
 #include "trace.h"
 
 #ifdef PERFORMANCEMONITOR_SUPPORT
@@ -68,8 +69,8 @@ int main(int argc, char *argv[])
     QStringList args = app.arguments();
     PerformanceMonitor::State performanceMonitorState;
     bool sourceIsUrl = false;
-    for (int i=1; i<args.count(); ++i) {
-        const QString &arg = args.at(i);
+    for (int i = 1; i < args.size(); ++i) {
+        const QByteArray arg = args.at(i).toUtf8();
         if (arg.startsWith('-')) {
             if ("-volume" == arg) {
                 if (i+1 < args.count())
@@ -78,7 +79,7 @@ int main(int argc, char *argv[])
                     qtTrace() << "Option \"-volume\" takes a value";
             }
 #ifdef PERFORMANCEMONITOR_SUPPORT
-            else if (PerformanceMonitor::parseArgument(arg, performanceMonitorState)) {
+            else if (performanceMonitorState.parseArgument(arg)) {
                 // Do nothing
             }
 #endif
@@ -108,10 +109,10 @@ int main(int argc, char *argv[])
             url2 = QUrl::fromLocalFile(source2);
     }
 
-    QmlApplicationViewer viewer;
+    QQuickView viewer;
+    viewer.setSource(QUrl("qrc:///qml/qmlvideo/main.qml"));
+    QObject::connect(viewer.engine(), SIGNAL(quit()), &viewer, SLOT(close()));
 
-    viewer.requestOrientation(Qt::LandscapeOrientation);
-    viewer.setMainQmlFile(QLatin1String("qml/qmlvideo/main.qml"));
     QQuickItem *rootObject = viewer.rootObject();
     rootObject->setProperty("source1", url1);
     rootObject->setProperty("source2", url2);
@@ -134,7 +135,7 @@ int main(int argc, char *argv[])
 
     QMetaObject::invokeMethod(rootObject, "init");
 
-    viewer.showExpanded();
+    viewer.show();
 
     return app.exec();
 }
diff --git a/examples/video/qmlvideo/qml/qmlvideo/Button.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Button.qml
index f3814b860..f3814b860 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/Button.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Button.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraBasic.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraBasic.qml
index bf7cf16a7..bf7cf16a7 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/CameraBasic.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraBasic.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraDrag.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDrag.qml
index 05cd1b232..05cd1b232 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/CameraDrag.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDrag.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraDummy.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDummy.qml
index 8895f7ac1..8895f7ac1 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/CameraDummy.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDummy.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraFullScreen.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraFullScreen.qml
index 6b69d1804..6b69d1804 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/CameraFullScreen.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraFullScreen.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraFullScreenInverted.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraFullScreenInverted.qml
index 519809faf..519809faf 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/CameraFullScreenInverted.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraFullScreenInverted.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraItem.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraItem.qml
index 775f65f12..775f65f12 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/CameraItem.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraItem.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraMove.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraMove.qml
index 14a418bc9..14a418bc9 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/CameraMove.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraMove.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraOverlay.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraOverlay.qml
index 5a055de9b..5a055de9b 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/CameraOverlay.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraOverlay.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraResize.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraResize.qml
index 61758764b..61758764b 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/CameraResize.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraResize.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraRotate.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraRotate.qml
index a18bf6d10..a18bf6d10 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/CameraRotate.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraRotate.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/CameraSpin.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraSpin.qml
index 2c8b1f720..2c8b1f720 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/CameraSpin.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraSpin.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/Content.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Content.qml
index dc1079bf7..dc1079bf7 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/Content.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Content.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml
index 2325870ba..2325870ba 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml
index dfe6b4584..dfe6b4584 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/FileBrowser.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml
index dd4cf5908..dd4cf5908 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/FileBrowser.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/FileBrowser.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/Scene.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Scene.qml
index 903608346..903608346 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/Scene.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Scene.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneBasic.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml
index afec90392..afec90392 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/SceneBasic.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneDrag.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneDrag.qml
index a559ce12a..a559ce12a 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/SceneDrag.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneDrag.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml
index 3a94255ad..3a94255ad 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml
index c87d6767d..c87d6767d 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneMove.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneMove.qml
index 6a91c770b..6a91c770b 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/SceneMove.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneMove.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneMulti.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneMulti.qml
index 0895cb5b2..0895cb5b2 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/SceneMulti.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneMulti.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml
index d1c09270d..d1c09270d 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneResize.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneResize.qml
index 690dcfcd0..690dcfcd0 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/SceneResize.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneResize.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneRotate.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneRotate.qml
index a9d39217d..a9d39217d 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/SceneRotate.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneRotate.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml
index 6ec93dd85..6ec93dd85 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/SceneSpin.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneSpin.qml
index b8a1804c8..b8a1804c8 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/SceneSpin.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneSpin.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/SeekControl.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SeekControl.qml
index d286c6811..d286c6811 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/SeekControl.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SeekControl.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoBasic.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoBasic.qml
index 93d0f7c4f..93d0f7c4f 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/VideoBasic.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoBasic.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoDrag.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDrag.qml
index 85bc9a078..85bc9a078 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/VideoDrag.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDrag.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoDummy.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDummy.qml
index e7d320ff8..e7d320ff8 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/VideoDummy.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDummy.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml
index 6e853e5b1..6e853e5b1 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoFullScreen.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFullScreen.qml
index f7aee0ce6..f7aee0ce6 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/VideoFullScreen.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFullScreen.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoFullScreenInverted.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFullScreenInverted.qml
index c468a0ed0..c468a0ed0 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/VideoFullScreenInverted.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFullScreenInverted.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoItem.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoItem.qml
index bcd39cb73..bcd39cb73 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/VideoItem.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoItem.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml
index 3d29a150c..3d29a150c 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoMove.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMove.qml
index 4c04534b1..4c04534b1 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/VideoMove.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMove.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoOverlay.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoOverlay.qml
index aeca9961f..aeca9961f 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/VideoOverlay.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoOverlay.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml
index bdbbbc5ae..bdbbbc5ae 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoResize.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoResize.qml
index 13ef7c98d..13ef7c98d 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/VideoResize.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoResize.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoRotate.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoRotate.qml
index b5e3ed4ba..b5e3ed4ba 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/VideoRotate.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoRotate.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoSeek.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoSeek.qml
index 35b45ffdc..35b45ffdc 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/VideoSeek.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoSeek.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/VideoSpin.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoSpin.qml
index fed44e294..fed44e294 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/VideoSpin.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoSpin.qml
diff --git a/examples/video/qmlvideo/qml/qmlvideo/main.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/main.qml
index e5353cab7..e5353cab7 100644
--- a/examples/video/qmlvideo/qml/qmlvideo/main.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/main.qml
diff --git a/examples/video/qmlvideo/qmlvideo.png b/examples/multimedia/video/qmlvideo/qmlvideo.png
index 707d5c4e8..707d5c4e8 100644
--- a/examples/video/qmlvideo/qmlvideo.png
+++ b/examples/multimedia/video/qmlvideo/qmlvideo.png
diff --git a/examples/multimedia/video/qmlvideo/qmlvideo.pro b/examples/multimedia/video/qmlvideo/qmlvideo.pro
new file mode 100644
index 000000000..3ea513d3a
--- /dev/null
+++ b/examples/multimedia/video/qmlvideo/qmlvideo.pro
@@ -0,0 +1,18 @@
+TEMPLATE = app
+TARGET = qmlvideo
+
+QT += quick
+
+LOCAL_SOURCES = main.cpp
+LOCAL_HEADERS = trace.h
+
+SOURCES += $$LOCAL_SOURCES
+HEADERS += $$LOCAL_HEADERS
+RESOURCES += qmlvideo.qrc
+
+SNIPPETS_PATH = ../snippets
+include($$SNIPPETS_PATH/performancemonitor/performancemonitordeclarative.pri)
+
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/video/qmlvideo
+INSTALLS += target
+
diff --git a/examples/multimedia/video/qmlvideo/qmlvideo.qrc b/examples/multimedia/video/qmlvideo/qmlvideo.qrc
new file mode 100644
index 000000000..5bf2df8af
--- /dev/null
+++ b/examples/multimedia/video/qmlvideo/qmlvideo.qrc
@@ -0,0 +1,57 @@
+<RCC>
+    <qresource prefix="/">
+        <file alias="leaves.jpg">images/leaves.jpg</file>
+        <file alias="close.png">images/close.png</file>
+        <file alias="folder.png">images/folder.png</file>
+        <file alias="titlebar.png">images/titlebar.png</file>
+        <file alias="titlebar.sci">images/titlebar.sci</file>
+        <file alias="up.png">images/up.png</file>
+        <file alias="progress_handle.svg">images/progress_handle.svg</file>
+        <file alias="progress_handle_pressed.svg">images/progress_handle_pressed.svg</file>
+        <file>qml/qmlvideo/Button.qml</file>
+        <file>qml/qmlvideo/CameraBasic.qml</file>
+        <file>qml/qmlvideo/CameraDrag.qml</file>
+        <file>qml/qmlvideo/CameraDummy.qml</file>
+        <file>qml/qmlvideo/CameraFullScreen.qml</file>
+        <file>qml/qmlvideo/CameraFullScreenInverted.qml</file>
+        <file>qml/qmlvideo/CameraItem.qml</file>
+        <file>qml/qmlvideo/CameraMove.qml</file>
+        <file>qml/qmlvideo/CameraOverlay.qml</file>
+        <file>qml/qmlvideo/CameraResize.qml</file>
+        <file>qml/qmlvideo/CameraRotate.qml</file>
+        <file>qml/qmlvideo/CameraSpin.qml</file>
+        <file>qml/qmlvideo/Content.qml</file>
+        <file>qml/qmlvideo/DisableScreenSaver.qml</file>
+        <file>qml/qmlvideo/ErrorDialog.qml</file>
+        <file>qml/qmlvideo/FileBrowser.qml</file>
+        <file>qml/qmlvideo/main.qml</file>
+        <file>qml/qmlvideo/Scene.qml</file>
+        <file>qml/qmlvideo/SceneBasic.qml</file>
+        <file>qml/qmlvideo/SceneDrag.qml</file>
+        <file>qml/qmlvideo/SceneFullScreen.qml</file>
+        <file>qml/qmlvideo/SceneFullScreenInverted.qml</file>
+        <file>qml/qmlvideo/SceneMove.qml</file>
+        <file>qml/qmlvideo/SceneMulti.qml</file>
+        <file>qml/qmlvideo/SceneOverlay.qml</file>
+        <file>qml/qmlvideo/SceneResize.qml</file>
+        <file>qml/qmlvideo/SceneRotate.qml</file>
+        <file>qml/qmlvideo/SceneSelectionPanel.qml</file>
+        <file>qml/qmlvideo/SceneSpin.qml</file>
+        <file>qml/qmlvideo/SeekControl.qml</file>
+        <file>qml/qmlvideo/VideoBasic.qml</file>
+        <file>qml/qmlvideo/VideoDrag.qml</file>
+        <file>qml/qmlvideo/VideoDummy.qml</file>
+        <file>qml/qmlvideo/VideoFillMode.qml</file>
+        <file>qml/qmlvideo/VideoFullScreen.qml</file>
+        <file>qml/qmlvideo/VideoFullScreenInverted.qml</file>
+        <file>qml/qmlvideo/VideoItem.qml</file>
+        <file>qml/qmlvideo/VideoMetadata.qml</file>
+        <file>qml/qmlvideo/VideoMove.qml</file>
+        <file>qml/qmlvideo/VideoOverlay.qml</file>
+        <file>qml/qmlvideo/VideoPlaybackRate.qml</file>
+        <file>qml/qmlvideo/VideoResize.qml</file>
+        <file>qml/qmlvideo/VideoRotate.qml</file>
+        <file>qml/qmlvideo/VideoSeek.qml</file>
+        <file>qml/qmlvideo/VideoSpin.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/video/qmlvideo/qmlvideo.svg b/examples/multimedia/video/qmlvideo/qmlvideo.svg
index 566acfada..566acfada 100644
--- a/examples/video/qmlvideo/qmlvideo.svg
+++ b/examples/multimedia/video/qmlvideo/qmlvideo.svg
diff --git a/examples/video/qmlvideo/trace.h b/examples/multimedia/video/qmlvideo/trace.h
index e6083f439..e6083f439 100644
--- a/examples/video/qmlvideo/trace.h
+++ b/examples/multimedia/video/qmlvideo/trace.h
diff --git a/examples/multimedia/video/qmlvideofx/filereader.cpp b/examples/multimedia/video/qmlvideofx/filereader.cpp
new file mode 100644
index 000000000..6c9773337
--- /dev/null
+++ b/examples/multimedia/video/qmlvideofx/filereader.cpp
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "filereader.h"
+#include "trace.h"
+
+#include <QCoreApplication>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QTextStream>
+
+QString FileReader::readFile(const QString &fileName)
+{
+    qtTrace() << "FileReader::readFile" << "fileName" << fileName;
+    QString content;
+    QFile file(fileName);
+    if (file.open(QIODevice::ReadOnly)) {
+        QTextStream stream(&file);
+        content = stream.readAll();
+    }
+    return content;
+}
+
diff --git a/examples/video/qmlvideofx/filereader.h b/examples/multimedia/video/qmlvideofx/filereader.h
index 44393b1c7..443a2a2fe 100644
--- a/examples/video/qmlvideofx/filereader.h
+++ b/examples/multimedia/video/qmlvideofx/filereader.h
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class FileReader : public QObject
 {
diff --git a/examples/video/qmlvideofx/images/close.png b/examples/multimedia/video/qmlvideofx/images/close.png
index 6904df0e4..6904df0e4 100644
--- a/examples/video/qmlvideofx/images/close.png
+++ b/examples/multimedia/video/qmlvideofx/images/close.png
diff --git a/examples/video/qmlvideofx/images/folder.png b/examples/multimedia/video/qmlvideofx/images/folder.png
index e53e2ad46..e53e2ad46 100644
--- a/examples/video/qmlvideofx/images/folder.png
+++ b/examples/multimedia/video/qmlvideofx/images/folder.png
diff --git a/examples/video/qmlvideofx/images/qt-logo.png b/examples/multimedia/video/qmlvideofx/images/qt-logo.png
index 7d3e97eb3..7d3e97eb3 100644
--- a/examples/video/qmlvideofx/images/qt-logo.png
+++ b/examples/multimedia/video/qmlvideofx/images/qt-logo.png
diff --git a/examples/video/qmlvideofx/images/titlebar.png b/examples/multimedia/video/qmlvideofx/images/titlebar.png
index 51c90082d..51c90082d 100644
--- a/examples/video/qmlvideofx/images/titlebar.png
+++ b/examples/multimedia/video/qmlvideofx/images/titlebar.png
diff --git a/examples/video/qmlvideofx/images/titlebar.sci b/examples/multimedia/video/qmlvideofx/images/titlebar.sci
index 0418d94cd..0418d94cd 100644
--- a/examples/video/qmlvideofx/images/titlebar.sci
+++ b/examples/multimedia/video/qmlvideofx/images/titlebar.sci
diff --git a/examples/video/qmlvideofx/images/up.png b/examples/multimedia/video/qmlvideofx/images/up.png
index b05f8025d..b05f8025d 100644
--- a/examples/video/qmlvideofx/images/up.png
+++ b/examples/multimedia/video/qmlvideofx/images/up.png
diff --git a/examples/video/qmlvideofx/main.cpp b/examples/multimedia/video/qmlvideofx/main.cpp
index dff51776a..056c274e9 100644
--- a/examples/video/qmlvideofx/main.cpp
+++ b/examples/multimedia/video/qmlvideofx/main.cpp
@@ -44,8 +44,8 @@
 #include <QtQml/QQmlContext>
 #include <QtGui/QGuiApplication>
 #include <QtQuick/QQuickItem>
+#include <QtQuick/QQuickView>
 #include "filereader.h"
-#include "qmlapplicationviewer.h"
 #include "trace.h"
 
 #ifdef SMALL_SCREEN_LAYOUT
@@ -72,17 +72,17 @@ int main(int argc, char *argv[])
 #ifdef PERFORMANCEMONITOR_SUPPORT
     PerformanceMonitor::State performanceMonitorState;
 #endif
-    for (int i=1; i<args.count(); ++i) {
-        const QString &arg = args.at(i);
+    for (int i = 1; i < args.size(); ++i) {
+        const QByteArray arg = args.at(i).toUtf8();
         if (arg.startsWith('-')) {
             if ("-volume" == arg) {
-                if (i+1 < args.count())
+                if (i + 1 < args.size())
                     volume = 0.01 * args.at(++i).toInt();
                 else
                     qtTrace() << "Option \"-volume\" takes a value";
             }
 #ifdef PERFORMANCEMONITOR_SUPPORT
-            else if (PerformanceMonitor::parseArgument(arg, performanceMonitorState)) {
+            else if (performanceMonitorState.parseArgument(arg)) {
                 // Do nothing
             }
 #endif
@@ -97,10 +97,9 @@ int main(int argc, char *argv[])
         }
     }
 
-    QmlApplicationViewer viewer;
+    QQuickView viewer;
 
-    viewer.requestOrientation(Qt::LandscapeOrientation);
-    viewer.setMainQmlFile(QLatin1String("qml/qmlvideofx/") + MainQmlFile);
+    viewer.setSource(QLatin1String("qrc:///qml/qmlvideofx/") + MainQmlFile);
     QQuickItem *rootObject = viewer.rootObject();
     rootObject->setProperty("fileName", fileName);
     viewer.rootObject()->setProperty("volume", volume);
@@ -137,7 +136,7 @@ int main(int argc, char *argv[])
 #ifdef SMALL_SCREEN_PHYSICAL
     viewer.showFullScreen();
 #else
-    viewer.showExpanded();
+    viewer.show();
 #endif
 
     // Delay invocation of init until the event loop has started, to work around
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/Button.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Button.qml
index f3814b860..f3814b860 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/Button.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Button.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/Content.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml
index e2ae9cda8..e2ae9cda8 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/Content.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml
index fb146a3cc..fb146a3cc 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/ContentImage.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentImage.qml
index 36c9a2b24..36c9a2b24 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/ContentImage.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentImage.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml
index 76c9025a9..76c9025a9 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml
index 309b289b0..309b289b0 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/Divider.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Divider.qml
index e6d937dad..e6d937dad 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/Divider.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Divider.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/Effect.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Effect.qml
index 535ab106b..0010673e3 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/Effect.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Effect.qml
@@ -69,7 +69,7 @@ ShaderEffect {
     // rather than being inline in the QML file
 
     onFragmentShaderFilenameChanged:
-        fragmentShader = d.fragmentShaderCommon + fileReader.readFile(fragmentShaderFilename)
+        fragmentShader = d.fragmentShaderCommon + fileReader.readFile(":shaders/" + fragmentShaderFilename)
     onVertexShaderFilenameChanged:
         vertexShader = fileReader.readFile(vertexShaderFilename)
 }
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml
index 124a2a17e..4a458b735 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml
@@ -55,5 +55,5 @@ Effect {
     property real step_x: 0.0015625
     property real step_y: targetHeight ? (step_x * targetWidth / targetHeight) : 0.0
 
-    fragmentShaderFilename: "shaders/billboard.fsh"
+    fragmentShaderFilename: "billboard.fsh"
 }
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml
index 37a3b6e0d..0660e9185 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml
@@ -52,5 +52,5 @@ Effect {
     // Transform slider values, and bind result to shader uniforms
     property real threshold: parameters.get(0).value
 
-    fragmentShaderFilename: "shaders/blackandwhite.fsh"
+    fragmentShaderFilename: "blackandwhite.fsh"
 }
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml
index 4bf57718d..a71b30ec5 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml
@@ -42,5 +42,5 @@
 import QtQuick 2.0
 
 Effect {
-    fragmentShaderFilename: "shaders/emboss.fsh"
+    fragmentShaderFilename: "emboss.fsh"
 }
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml
index b804e903b..a3ef8749a 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml
@@ -63,7 +63,7 @@ Item {
         anchors.fill:  parent
         dividerValue: parent.dividerValue
         property real blurSize: 4.0 * parent.parameters.get(0).value / targetHeight
-        fragmentShaderFilename: "shaders/gaussianblur_v.fsh"
+        fragmentShaderFilename: "gaussianblur_v.fsh"
     }
 
     Effect {
@@ -71,7 +71,7 @@ Item {
         anchors.fill: parent
         dividerValue: parent.dividerValue
         property real blurSize: 4.0 * parent.parameters.get(0).value / parent.targetWidth
-        fragmentShaderFilename: "shaders/gaussianblur_h.fsh"
+        fragmentShaderFilename: "gaussianblur_h.fsh"
         source: horizontalShaderSource
 
         ShaderEffectSource {
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml
index d6e987db2..5b3ae41b0 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml
@@ -42,5 +42,5 @@
 import QtQuick 2.0
 
 Effect {
-    fragmentShaderFilename: "shaders/glow.fsh"
+    fragmentShaderFilename: "glow.fsh"
 }
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml
index 2425a2580..d81c7930c 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml
@@ -57,5 +57,5 @@ Effect {
     property real targetHue: parameters.get(0).value * 360
     property real windowWidth: parameters.get(1).value * 60
 
-    fragmentShaderFilename: "shaders/isolate.fsh"
+    fragmentShaderFilename: "isolate.fsh"
 }
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml
index 5a207f95e..4a37a0ad1 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml
@@ -84,7 +84,7 @@ Effect {
         d.oldTargetHeight = targetHeight
     }
 
-    fragmentShaderFilename: "shaders/magnify.fsh"
+    fragmentShaderFilename: "magnify.fsh"
 
     MouseArea {
         anchors.fill: parent
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml
index 7724bfa9b..862c2673c 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml
@@ -53,5 +53,5 @@ Effect {
     // Transform slider values, and bind result to shader uniforms
     property real curlExtent: 1.0 - parameters.get(0).value
 
-    fragmentShaderFilename: "shaders/pagecurl.fsh"
+    fragmentShaderFilename: "pagecurl.fsh"
 }
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml
index 1f259bebb..1f259bebb 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml
index 71f7da965..11281f777 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml
@@ -52,5 +52,5 @@ Effect {
     // Transform slider values, and bind result to shader uniforms
     property real granularity: parameters.get(0).value * 20
 
-    fragmentShaderFilename: "shaders/pixelate.fsh"
+    fragmentShaderFilename: "pixelate.fsh"
 }
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml
index 0cf16a0dc..c70a0c10f 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml
@@ -54,5 +54,5 @@ Effect {
 
     property real numColors: 8.0
 
-    fragmentShaderFilename: "shaders/posterize.fsh"
+    fragmentShaderFilename: "posterize.fsh"
 }
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml
index 0b7c48cbc..0ec0d13a3 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml
@@ -60,5 +60,5 @@ Effect {
     property real time: 0
     NumberAnimation on time { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 600 }
 
-    fragmentShaderFilename: "shaders/ripple.fsh"
+    fragmentShaderFilename: "ripple.fsh"
 }
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml
index 78cf965e1..78cf965e1 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml
index 446e7790b..2b42e68c6 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml
@@ -42,5 +42,5 @@
 import QtQuick 2.0
 
 Effect {
-    fragmentShaderFilename: "shaders/sepia.fsh"
+    fragmentShaderFilename: "sepia.fsh"
 }
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml
index 99ece3cd8..2c69378d7 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml
@@ -52,5 +52,5 @@ Effect {
     // Transform slider values, and bind result to shader uniforms
     property real amount: parameters.get(0).value * 18
 
-    fragmentShaderFilename: "shaders/sharpen.fsh"
+    fragmentShaderFilename: "sharpen.fsh"
 }
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml
index fe91781ba..7716bf672 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml
@@ -76,5 +76,5 @@ Effect {
         }
     }
 
-    fragmentShaderFilename: "shaders/shockwave.fsh"
+    fragmentShaderFilename: "shockwave.fsh"
 }
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml
index 189d5d385..78b908549 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml
@@ -55,5 +55,5 @@ Effect {
     property real resS: targetSize
     property real resT: targetSize
 
-    fragmentShaderFilename: "shaders/sobeledgedetection1.fsh"
+    fragmentShaderFilename: "sobeledgedetection1.fsh"
 }
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml
index 4bcc6efaa..94d87b43e 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml
@@ -52,5 +52,5 @@ Effect {
     // Transform slider values, and bind result to shader uniforms
     property real weight: parameters.get(0).value
 
-    fragmentShaderFilename: "shaders/sobeledgedetection2.fsh"
+    fragmentShaderFilename: "sobeledgedetection2.fsh"
 }
diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml
new file mode 100644
index 000000000..b8097a6c2
--- /dev/null
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+Effect {
+    fragmentShaderFilename: "tiltshift.fsh"
+}
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml
index 08f184997..31d8869b8 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml
@@ -59,5 +59,5 @@ Effect {
     property real magTol: 0.3
     property real quantize: 8.0
 
-    fragmentShaderFilename: "shaders/toon.fsh"
+    fragmentShaderFilename: "toon.fsh"
 }
diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml
new file mode 100644
index 000000000..be868e285
--- /dev/null
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+Effect {
+    fragmentShaderFilename: "vignette.fsh"
+}
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml
index e96d0524d..0592507e5 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml
@@ -42,5 +42,5 @@
 import QtQuick 2.0
 
 Effect {
-    fragmentShaderFilename: "shaders/warhol.fsh"
+    fragmentShaderFilename: "warhol.fsh"
 }
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml
index 4cccf48b8..191eb9386 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml
@@ -57,5 +57,5 @@ Effect {
 
     NumberAnimation on time { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 600 }
 
-    fragmentShaderFilename: "shaders/wobble.fsh"
+    fragmentShaderFilename: "wobble.fsh"
 }
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml
index 9abbb294d..9abbb294d 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml
index d05ccea52..d05ccea52 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/HintedMouseArea.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/HintedMouseArea.qml
index 22d28caf4..22d28caf4 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/HintedMouseArea.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/HintedMouseArea.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml
index 1ce0c87ba..1ce0c87ba 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/Slider.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Slider.qml
index f3a7acd08..f3a7acd08 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/Slider.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Slider.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/main-largescreen.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/main-largescreen.qml
index 772a86908..772a86908 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/main-largescreen.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/main-largescreen.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/main-smallscreen.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/main-smallscreen.qml
index 59a0c994c..59a0c994c 100644
--- a/examples/video/qmlvideofx/qml/qmlvideofx/main-smallscreen.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/main-smallscreen.qml
diff --git a/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp
index 2ffc0b219..2ffc0b219 100644
--- a/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp
diff --git a/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.h b/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.h
index a4eabdba8..a4eabdba8 100644
--- a/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.h
+++ b/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.h
diff --git a/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri b/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri
index d9807943e..d9807943e 100644
--- a/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri
diff --git a/examples/video/qmlvideofx/qmlvideofx.png b/examples/multimedia/video/qmlvideofx/qmlvideofx.png
index 707d5c4e8..707d5c4e8 100644
--- a/examples/video/qmlvideofx/qmlvideofx.png
+++ b/examples/multimedia/video/qmlvideofx/qmlvideofx.png
diff --git a/examples/multimedia/video/qmlvideofx/qmlvideofx.pro b/examples/multimedia/video/qmlvideofx/qmlvideofx.pro
new file mode 100644
index 000000000..d62ade86d
--- /dev/null
+++ b/examples/multimedia/video/qmlvideofx/qmlvideofx.pro
@@ -0,0 +1,19 @@
+TEMPLATE = app
+TARGET = qmlvideofx
+
+QT += quick
+
+SOURCES += filereader.cpp main.cpp
+HEADERS += filereader.h trace.h
+
+RESOURCES += qmlvideofx.qrc
+
+include($$PWD/../snippets/performancemonitor/performancemonitordeclarative.pri)
+
+maemo6: {
+    DEFINES += SMALL_SCREEN_LAYOUT
+    DEFINES += SMALL_SCREEN_PHYSICAL
+}
+
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/video/qmlvideofx
+INSTALLS += target
diff --git a/examples/multimedia/video/qmlvideofx/qmlvideofx.qrc b/examples/multimedia/video/qmlvideofx/qmlvideofx.qrc
new file mode 100644
index 000000000..93cb4f1f5
--- /dev/null
+++ b/examples/multimedia/video/qmlvideofx/qmlvideofx.qrc
@@ -0,0 +1,71 @@
+<RCC>
+    <qresource prefix="/">
+        <file>images/close.png</file>
+        <file>images/folder.png</file>
+        <file>images/titlebar.png</file>
+        <file>images/titlebar.sci</file>
+        <file>images/up.png</file>
+        <file>images/qt-logo.png</file>
+        <file>qml/qmlvideofx/Button.qml</file>
+        <file>qml/qmlvideofx/Content.qml</file>
+        <file>qml/qmlvideofx/ContentCamera.qml</file>
+        <file>qml/qmlvideofx/ContentImage.qml</file>
+        <file>qml/qmlvideofx/ContentVideo.qml</file>
+        <file>qml/qmlvideofx/DisableScreenSaver.qml</file>
+        <file>qml/qmlvideofx/Divider.qml</file>
+        <file>qml/qmlvideofx/Effect.qml</file>
+        <file>qml/qmlvideofx/EffectBillboard.qml</file>
+        <file>qml/qmlvideofx/EffectBlackAndWhite.qml</file>
+        <file>qml/qmlvideofx/EffectEmboss.qml</file>
+        <file>qml/qmlvideofx/EffectGaussianBlur.qml</file>
+        <file>qml/qmlvideofx/EffectGlow.qml</file>
+        <file>qml/qmlvideofx/EffectIsolate.qml</file>
+        <file>qml/qmlvideofx/EffectMagnify.qml</file>
+        <file>qml/qmlvideofx/EffectPageCurl.qml</file>
+        <file>qml/qmlvideofx/EffectPassThrough.qml</file>
+        <file>qml/qmlvideofx/EffectPixelate.qml</file>
+        <file>qml/qmlvideofx/EffectPosterize.qml</file>
+        <file>qml/qmlvideofx/EffectRipple.qml</file>
+        <file>qml/qmlvideofx/EffectSelectionPanel.qml</file>
+        <file>qml/qmlvideofx/EffectSepia.qml</file>
+        <file>qml/qmlvideofx/EffectSharpen.qml</file>
+        <file>qml/qmlvideofx/EffectShockwave.qml</file>
+        <file>qml/qmlvideofx/EffectSobelEdgeDetection1.qml</file>
+        <file>qml/qmlvideofx/EffectSobelEdgeDetection2.qml</file>
+        <file>qml/qmlvideofx/EffectTiltShift.qml</file>
+        <file>qml/qmlvideofx/EffectToon.qml</file>
+        <file>qml/qmlvideofx/EffectVignette.qml</file>
+        <file>qml/qmlvideofx/EffectWarhol.qml</file>
+        <file>qml/qmlvideofx/EffectWobble.qml</file>
+        <file>qml/qmlvideofx/FileBrowser.qml</file>
+        <file>qml/qmlvideofx/FileOpen.qml</file>
+        <file>qml/qmlvideofx/HintedMouseArea.qml</file>
+        <file>qml/qmlvideofx/main-largescreen.qml</file>
+        <file>qml/qmlvideofx/main-smallscreen.qml</file>
+        <file>qml/qmlvideofx/ParameterPanel.qml</file>
+        <file>qml/qmlvideofx/Slider.qml</file>
+        <file>shaders/billboard.fsh</file>
+        <file>shaders/blackandwhite.fsh</file>
+        <file>shaders/emboss.fsh</file>
+        <file>shaders/gaussianblur_h.fsh</file>
+        <file>shaders/gaussianblur_v.fsh</file>
+        <file>shaders/glow.fsh</file>
+        <file>shaders/isolate.fsh</file>
+        <file>shaders/magnify.fsh</file>
+        <file>shaders/pagecurl.fsh</file>
+        <file>shaders/pixelate.fsh</file>
+        <file>shaders/posterize.fsh</file>
+        <file>shaders/ripple.fsh</file>
+        <file>shaders/selectionpanel.fsh</file>
+        <file>shaders/sepia.fsh</file>
+        <file>shaders/sharpen.fsh</file>
+        <file>shaders/shockwave.fsh</file>
+        <file>shaders/sobeledgedetection1.fsh</file>
+        <file>shaders/sobeledgedetection2.fsh</file>
+        <file>shaders/tiltshift.fsh</file>
+        <file>shaders/toon.fsh</file>
+        <file>shaders/vignette.fsh</file>
+        <file>shaders/warhol.fsh</file>
+        <file>shaders/wobble.fsh</file>
+    </qresource>
+</RCC>
diff --git a/examples/video/qmlvideofx/qmlvideofx.svg b/examples/multimedia/video/qmlvideofx/qmlvideofx.svg
index 566acfada..566acfada 100644
--- a/examples/video/qmlvideofx/qmlvideofx.svg
+++ b/examples/multimedia/video/qmlvideofx/qmlvideofx.svg
diff --git a/examples/video/qmlvideofx/shaders/billboard.fsh b/examples/multimedia/video/qmlvideofx/shaders/billboard.fsh
index baa955432..baa955432 100644
--- a/examples/video/qmlvideofx/shaders/billboard.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/billboard.fsh
diff --git a/examples/video/qmlvideofx/shaders/blackandwhite.fsh b/examples/multimedia/video/qmlvideofx/shaders/blackandwhite.fsh
index 40756c42f..40756c42f 100644
--- a/examples/video/qmlvideofx/shaders/blackandwhite.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/blackandwhite.fsh
diff --git a/examples/video/qmlvideofx/shaders/emboss.fsh b/examples/multimedia/video/qmlvideofx/shaders/emboss.fsh
index bd13a0b5e..bd13a0b5e 100644
--- a/examples/video/qmlvideofx/shaders/emboss.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/emboss.fsh
diff --git a/examples/video/qmlvideofx/shaders/gaussianblur_h.fsh b/examples/multimedia/video/qmlvideofx/shaders/gaussianblur_h.fsh
index 96ae8e43c..96ae8e43c 100644
--- a/examples/video/qmlvideofx/shaders/gaussianblur_h.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/gaussianblur_h.fsh
diff --git a/examples/video/qmlvideofx/shaders/gaussianblur_v.fsh b/examples/multimedia/video/qmlvideofx/shaders/gaussianblur_v.fsh
index 6bc7b8b74..6bc7b8b74 100644
--- a/examples/video/qmlvideofx/shaders/gaussianblur_v.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/gaussianblur_v.fsh
diff --git a/examples/video/qmlvideofx/shaders/glow.fsh b/examples/multimedia/video/qmlvideofx/shaders/glow.fsh
index e0adcfd65..e0adcfd65 100644
--- a/examples/video/qmlvideofx/shaders/glow.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/glow.fsh
diff --git a/examples/video/qmlvideofx/shaders/isolate.fsh b/examples/multimedia/video/qmlvideofx/shaders/isolate.fsh
index 0f25bfab3..0f25bfab3 100644
--- a/examples/video/qmlvideofx/shaders/isolate.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/isolate.fsh
diff --git a/examples/video/qmlvideofx/shaders/magnify.fsh b/examples/multimedia/video/qmlvideofx/shaders/magnify.fsh
index 638254934..638254934 100644
--- a/examples/video/qmlvideofx/shaders/magnify.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/magnify.fsh
diff --git a/examples/video/qmlvideofx/shaders/pagecurl.fsh b/examples/multimedia/video/qmlvideofx/shaders/pagecurl.fsh
index 08e4f4cf1..08e4f4cf1 100644
--- a/examples/video/qmlvideofx/shaders/pagecurl.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/pagecurl.fsh
diff --git a/examples/video/qmlvideofx/shaders/pixelate.fsh b/examples/multimedia/video/qmlvideofx/shaders/pixelate.fsh
index 922d79b6f..922d79b6f 100644
--- a/examples/video/qmlvideofx/shaders/pixelate.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/pixelate.fsh
diff --git a/examples/video/qmlvideofx/shaders/posterize.fsh b/examples/multimedia/video/qmlvideofx/shaders/posterize.fsh
index e5c77ce14..e5c77ce14 100644
--- a/examples/video/qmlvideofx/shaders/posterize.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/posterize.fsh
diff --git a/examples/video/qmlvideofx/shaders/ripple.fsh b/examples/multimedia/video/qmlvideofx/shaders/ripple.fsh
index bb07fc263..bb07fc263 100644
--- a/examples/video/qmlvideofx/shaders/ripple.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/ripple.fsh
diff --git a/examples/video/qmlvideofx/shaders/selectionpanel.fsh b/examples/multimedia/video/qmlvideofx/shaders/selectionpanel.fsh
index 89d570e35..89d570e35 100644
--- a/examples/video/qmlvideofx/shaders/selectionpanel.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/selectionpanel.fsh
diff --git a/examples/video/qmlvideofx/shaders/sepia.fsh b/examples/multimedia/video/qmlvideofx/shaders/sepia.fsh
index 196c51782..196c51782 100644
--- a/examples/video/qmlvideofx/shaders/sepia.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/sepia.fsh
diff --git a/examples/video/qmlvideofx/shaders/sharpen.fsh b/examples/multimedia/video/qmlvideofx/shaders/sharpen.fsh
index 39076375b..39076375b 100644
--- a/examples/video/qmlvideofx/shaders/sharpen.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/sharpen.fsh
diff --git a/examples/video/qmlvideofx/shaders/shockwave.fsh b/examples/multimedia/video/qmlvideofx/shaders/shockwave.fsh
index 64f33c8a1..64f33c8a1 100644
--- a/examples/video/qmlvideofx/shaders/shockwave.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/shockwave.fsh
diff --git a/examples/video/qmlvideofx/shaders/sobeledgedetection1.fsh b/examples/multimedia/video/qmlvideofx/shaders/sobeledgedetection1.fsh
index 96732fa30..96732fa30 100644
--- a/examples/video/qmlvideofx/shaders/sobeledgedetection1.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/sobeledgedetection1.fsh
diff --git a/examples/video/qmlvideofx/shaders/sobeledgedetection2.fsh b/examples/multimedia/video/qmlvideofx/shaders/sobeledgedetection2.fsh
index aa836ca2c..aa836ca2c 100644
--- a/examples/video/qmlvideofx/shaders/sobeledgedetection2.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/sobeledgedetection2.fsh
diff --git a/examples/video/qmlvideofx/shaders/tiltshift.fsh b/examples/multimedia/video/qmlvideofx/shaders/tiltshift.fsh
index becd9fe5d..becd9fe5d 100644
--- a/examples/video/qmlvideofx/shaders/tiltshift.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/tiltshift.fsh
diff --git a/examples/video/qmlvideofx/shaders/toon.fsh b/examples/multimedia/video/qmlvideofx/shaders/toon.fsh
index 2814dfbc8..2814dfbc8 100644
--- a/examples/video/qmlvideofx/shaders/toon.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/toon.fsh
diff --git a/examples/video/qmlvideofx/shaders/vignette.fsh b/examples/multimedia/video/qmlvideofx/shaders/vignette.fsh
index bd20c8e8a..bd20c8e8a 100644
--- a/examples/video/qmlvideofx/shaders/vignette.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/vignette.fsh
diff --git a/examples/video/qmlvideofx/shaders/warhol.fsh b/examples/multimedia/video/qmlvideofx/shaders/warhol.fsh
index 6852495a5..6852495a5 100644
--- a/examples/video/qmlvideofx/shaders/warhol.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/warhol.fsh
diff --git a/examples/video/qmlvideofx/shaders/wobble.fsh b/examples/multimedia/video/qmlvideofx/shaders/wobble.fsh
index 9f42d715d..9f42d715d 100644
--- a/examples/video/qmlvideofx/shaders/wobble.fsh
+++ b/examples/multimedia/video/qmlvideofx/shaders/wobble.fsh
diff --git a/examples/video/qmlvideofx/trace.h b/examples/multimedia/video/qmlvideofx/trace.h
index 73095f595..c5332d5da 100644
--- a/examples/video/qmlvideofx/trace.h
+++ b/examples/multimedia/video/qmlvideofx/trace.h
@@ -42,7 +42,7 @@
 #ifndef TRACE_H
 #define TRACE_H
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 #define ENABLE_TRACE
 //#define VERBOSE_TRACE
@@ -53,7 +53,7 @@ class NullDebug
 {
 public:
     template <typename T>
-    NullDebug& operator<<(const T&) { return *this; }
+    NullDebug &operator<<(const T &) { return *this; }
 };
 
 inline NullDebug nullDebug() { return NullDebug(); }
@@ -68,18 +68,12 @@ struct PtrWrapper
 } // namespace Trace
 
 template <typename T>
-inline QDebug& operator<<(QDebug &debug, const Trace::PtrWrapper<T> &wrapper)
+inline QDebug &operator<<(QDebug &debug, const Trace::PtrWrapper<T> &wrapper)
 {
     debug.nospace() << "[" << (void*)wrapper.m_ptr << "]";
     return debug.space();
 }
 
-template<typename T>
-inline const void *qtVoidPtr(const T *ptr)
-{ return static_cast<const void *>(ptr); }
-
-#define qtThisPtr() qtVoidPtr(this)
-
 #ifdef ENABLE_TRACE
         inline QDebug qtTrace() { return qDebug() << "[qmlvideofx]"; }
 #    ifdef VERBOSE_TRACE
diff --git a/examples/video/snippets/frequencymonitor/frequencymonitor.cpp b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.cpp
index 1d44f1297..568bbc79f 100644
--- a/examples/video/snippets/frequencymonitor/frequencymonitor.cpp
+++ b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.cpp
@@ -40,11 +40,11 @@
 ****************************************************************************/
 
 #include "frequencymonitor.h"
-#include <QtCore/QDebug>
-#include <QtCore/QElapsedTimer>
-#include <QtCore/QString>
-#include <QtCore/QTime>
-#include <QtCore/QTimer>
+#include <QDebug>
+#include <QElapsedTimer>
+#include <QString>
+#include <QTime>
+#include <QTimer>
 
 //#define VERBOSE_TRACE
 
@@ -61,6 +61,7 @@ static const int DefaultTraceInterval = 0;
 class FrequencyMonitorPrivate : public QObject
 {
     Q_OBJECT
+
 public:
     FrequencyMonitorPrivate(FrequencyMonitor *parent);
     void calculateInstantaneousFrequency();
@@ -116,16 +117,16 @@ void FrequencyMonitorPrivate::calculateInstantaneousFrequency()
     m_stalledTimer->start(3 * ms);
     if (m_instantaneousFrequency)
         q_ptr->setActive(true);
-    q_ptr->emit instantaneousFrequencyChanged(m_instantaneousFrequency);
-    q_ptr->emit frequencyChanged();
+    emit q_ptr->instantaneousFrequencyChanged(m_instantaneousFrequency);
+    emit q_ptr->frequencyChanged();
 }
 
 void FrequencyMonitorPrivate::calculateAverageFrequency()
 {
     const qint64 ms = m_averageElapsed.restart();
     m_averageFrequency = qreal(m_count * 1000) / ms;
-    q_ptr->emit averageFrequencyChanged(m_averageFrequency);
-    q_ptr->emit frequencyChanged();
+    emit q_ptr->averageFrequencyChanged(m_averageFrequency);
+    emit q_ptr->frequencyChanged();
     m_count = 0;
 }
 
@@ -134,14 +135,13 @@ void FrequencyMonitorPrivate::stalled()
     if (m_instantaneousFrequency) {
         qtVerboseTrace() << "FrequencyMonitor::stalled";
         m_instantaneousFrequency = 0;
-        q_ptr->emit instantaneousFrequencyChanged(m_instantaneousFrequency);
-        q_ptr->emit frequencyChanged();
+        emit q_ptr->instantaneousFrequencyChanged(m_instantaneousFrequency);
+        emit q_ptr->frequencyChanged();
     }
 }
 
 FrequencyMonitor::FrequencyMonitor(QObject *parent)
 :   QObject(parent)
-,   d_ptr(0)
 {
     d_ptr = new FrequencyMonitorPrivate(this);
     qtTrace() << "FrequencyMonitor::FrequencyMonitor";
@@ -152,7 +152,7 @@ FrequencyMonitor::~FrequencyMonitor()
 
 }
 
-const QString &FrequencyMonitor::label() const
+QString FrequencyMonitor::label() const
 {
     return d_func()->m_label;
 }
diff --git a/examples/video/snippets/frequencymonitor/frequencymonitor.h b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.h
index 1efd8b3ad..f34646f9e 100644
--- a/examples/video/snippets/frequencymonitor/frequencymonitor.h
+++ b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.h
@@ -42,8 +42,8 @@
 #ifndef FREQUENCYMONITOR_H
 #define FREQUENCYMONITOR_H
 
-#include <QtCore/QObject>
-#include <QtCore/QTimer>
+#include <QObject>
+#include <QTimer>
 
 class FrequencyMonitorPrivate;
 
@@ -64,13 +64,14 @@ class FrequencyMonitor : public QObject
     Q_PROPERTY(int traceInterval READ traceInterval WRITE setTraceInterval NOTIFY traceIntervalChanged)
     Q_PROPERTY(qreal instantaneousFrequency READ instantaneousFrequency NOTIFY instantaneousFrequencyChanged)
     Q_PROPERTY(qreal averageFrequency READ averageFrequency NOTIFY averageFrequencyChanged)
+
 public:
     FrequencyMonitor(QObject *parent = 0);
     ~FrequencyMonitor();
 
     static void qmlRegisterType();
 
-    const QString &label() const;
+    QString label() const;
     bool active() const;
     int samplingInterval() const;
     int traceInterval() const;
diff --git a/examples/video/snippets/frequencymonitor/frequencymonitor.pri b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.pri
index 3ac8a08c4..3ac8a08c4 100644
--- a/examples/video/snippets/frequencymonitor/frequencymonitor.pri
+++ b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.pri
diff --git a/examples/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp
index 33fd9a8ca..33fd9a8ca 100644
--- a/examples/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp
+++ b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp
diff --git a/examples/video/snippets/frequencymonitor/frequencymonitordeclarative.pri b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.pri
index 90a111cd1..071b7286a 100644
--- a/examples/video/snippets/frequencymonitor/frequencymonitordeclarative.pri
+++ b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.pri
@@ -1,3 +1,5 @@
 include($$PWD/frequencymonitor.pri)
 QT += qml
+
 SOURCES += $$PWD/frequencymonitordeclarative.cpp
+RESOURCES += $$PWD/frequencymonitordeclarative.qrc
diff --git a/examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.qrc b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.qrc
new file mode 100644
index 000000000..48e60cf1e
--- /dev/null
+++ b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>qml/frequencymonitor/FrequencyItem.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml b/examples/multimedia/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml
index 893d2e84c..893d2e84c 100644
--- a/examples/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml
+++ b/examples/multimedia/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml
diff --git a/examples/multimedia/video/snippets/performancemonitor/performancemonitor.cpp b/examples/multimedia/video/snippets/performancemonitor/performancemonitor.cpp
new file mode 100644
index 000000000..07c83485b
--- /dev/null
+++ b/examples/multimedia/video/snippets/performancemonitor/performancemonitor.cpp
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "performancemonitor.h"
+
+namespace PerformanceMonitor {
+
+bool State::parseArgument(const QByteArray &arg)
+{
+    bool result = false;
+    if (arg == "-log-perf") {
+        logging = true;
+        valid = true;
+        result = true;
+    } else if (arg == "-no-log-perf") {
+        logging = false;
+        valid = true;
+        result = true;
+    } else if (arg == "-show-perf") {
+        visible = true;
+        valid = true;
+        result = true;
+    } else if (arg == "-hide-perf") {
+        visible = false;
+        valid = true;
+        result = true;
+    }
+    return result;
+}
+
+} // namespace PerformanceMonitor
diff --git a/examples/video/snippets/performancemonitor/performancemonitor.h b/examples/multimedia/video/snippets/performancemonitor/performancemonitor.h
index d87d71eac..f1a443e0b 100644
--- a/examples/video/snippets/performancemonitor/performancemonitor.h
+++ b/examples/multimedia/video/snippets/performancemonitor/performancemonitor.h
@@ -42,24 +42,27 @@
 #ifndef PERFORMANCEMONITOR_H
 #define PERFORMANCEMONITOR_H
 
-#include <QtCore/QString>
+#include <QByteArray>
 
 namespace PerformanceMonitor {
-    struct State {
-        bool valid;
-        bool logging;
-        bool visible;
 
-        State() : valid(true), logging(false), visible(true) { }
-        State(bool l, bool v) : valid(true), logging(l), visible(v) { }
-        bool operator==(const State &other) const
-        { return logging == other.logging && visible == other.visible; }
-        bool operator!=(const State &other) const
-        { return logging != other.logging || visible != other.visible; }
-    };
+struct State
+{
+    State() : valid(true), logging(false), visible(true) { }
+    State(bool l, bool v) : valid(true), logging(l), visible(v) { }
+    bool operator==(const State &other) const
+    { return logging == other.logging && visible == other.visible; }
+    bool operator!=(const State &other) const
+    { return logging != other.logging || visible != other.visible; }
 
-    bool parseArgument(const QString &arg, State &state);
-}
+    bool parseArgument(const QByteArray &arg);
+
+    bool valid;
+    bool logging;
+    bool visible;
+};
+
+} // namespace PerformanceMonitor
 
 #endif // PERFORMANCEMONITOR_H
 
diff --git a/examples/video/snippets/performancemonitor/performancemonitor.pri b/examples/multimedia/video/snippets/performancemonitor/performancemonitor.pri
index 2df3cfb13..2df3cfb13 100644
--- a/examples/video/snippets/performancemonitor/performancemonitor.pri
+++ b/examples/multimedia/video/snippets/performancemonitor/performancemonitor.pri
diff --git a/examples/video/snippets/performancemonitor/performancemonitordeclarative.cpp b/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.cpp
index 257e628bf..257e628bf 100644
--- a/examples/video/snippets/performancemonitor/performancemonitordeclarative.cpp
+++ b/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.cpp
diff --git a/examples/video/snippets/performancemonitor/performancemonitordeclarative.h b/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.h
index e5515cb1b..e5515cb1b 100644
--- a/examples/video/snippets/performancemonitor/performancemonitordeclarative.h
+++ b/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.h
diff --git a/examples/video/snippets/performancemonitor/performancemonitordeclarative.pri b/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.pri
index cf32c4ed2..9a18e35e5 100644
--- a/examples/video/snippets/performancemonitor/performancemonitordeclarative.pri
+++ b/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.pri
@@ -3,3 +3,4 @@ include($$PWD/performancemonitor.pri)
 
 HEADERS += $$PWD/performancemonitordeclarative.h
 SOURCES += $$PWD/performancemonitordeclarative.cpp
+RESOURCES += $$PWD/performancemonitordeclarative.qrc
diff --git a/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.qrc b/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.qrc
new file mode 100644
index 000000000..9ec54a3e4
--- /dev/null
+++ b/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>qml/performancemonitor/PerformanceItem.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml b/examples/multimedia/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml
index c62d22555..c62d22555 100644
--- a/examples/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml
+++ b/examples/multimedia/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml
diff --git a/examples/multimedia/video/video.pro b/examples/multimedia/video/video.pro
new file mode 100644
index 000000000..3127a4e49
--- /dev/null
+++ b/examples/multimedia/video/video.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+
+SUBDIRS += qmlvideo qmlvideofx
+
diff --git a/examples/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp
index c270d5585..c270d5585 100644
--- a/examples/camera/camera.cpp
+++ b/examples/multimediawidgets/camera/camera.cpp
diff --git a/examples/camera/camera.h b/examples/multimediawidgets/camera/camera.h
index 299483f67..299483f67 100644
--- a/examples/camera/camera.h
+++ b/examples/multimediawidgets/camera/camera.h
diff --git a/examples/camera/camera.pro b/examples/multimediawidgets/camera/camera.pro
index f7dd8b787..fe8f39385 100644
--- a/examples/camera/camera.pro
+++ b/examples/multimediawidgets/camera/camera.pro
@@ -19,10 +19,7 @@ FORMS += \
     videosettings.ui \
     imagesettings.ui
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/camera
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/camera
-
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/camera
+INSTALLS += target
 
 QT+=widgets
diff --git a/examples/camera/camera.ui b/examples/multimediawidgets/camera/camera.ui
index ea790fab0..ea790fab0 100644
--- a/examples/camera/camera.ui
+++ b/examples/multimediawidgets/camera/camera.ui
diff --git a/examples/camera/doc/images/camera-example.png b/examples/multimediawidgets/camera/doc/images/camera-example.png
index 12e1b5728..12e1b5728 100644
--- a/examples/camera/doc/images/camera-example.png
+++ b/examples/multimediawidgets/camera/doc/images/camera-example.png
diff --git a/examples/camera/doc/src/camera.qdoc b/examples/multimediawidgets/camera/doc/src/camera.qdoc
index c40c25135..15bf9fddf 100644
--- a/examples/camera/doc/src/camera.qdoc
+++ b/examples/multimediawidgets/camera/doc/src/camera.qdoc
@@ -29,14 +29,12 @@
 
 /*!
 
-\example camera
+\example multimediawidgets/camera
 \title  Camera Example
-\ingroup camera_examples
+\ingroup multimedia_examples
 \brief  The Camera Example shows how to use the API to capture a still image
 or video.
 
-
-
 The Camera Example demonstrates how you can use QtMultimedia to implement
 some basic Camera functionality to take still images and record video clips
 with audio.
diff --git a/examples/camera/imagesettings.cpp b/examples/multimediawidgets/camera/imagesettings.cpp
index 566a1260b..566a1260b 100644
--- a/examples/camera/imagesettings.cpp
+++ b/examples/multimediawidgets/camera/imagesettings.cpp
diff --git a/examples/camera/imagesettings.h b/examples/multimediawidgets/camera/imagesettings.h
index 5c3e69461..5c3e69461 100644
--- a/examples/camera/imagesettings.h
+++ b/examples/multimediawidgets/camera/imagesettings.h
diff --git a/examples/camera/imagesettings.ui b/examples/multimediawidgets/camera/imagesettings.ui
index f790c770d..f790c770d 100644
--- a/examples/camera/imagesettings.ui
+++ b/examples/multimediawidgets/camera/imagesettings.ui
diff --git a/examples/camera/main.cpp b/examples/multimediawidgets/camera/main.cpp
index aa5fbdb84..aa5fbdb84 100644
--- a/examples/camera/main.cpp
+++ b/examples/multimediawidgets/camera/main.cpp
diff --git a/examples/camera/videosettings.cpp b/examples/multimediawidgets/camera/videosettings.cpp
index 2ec880801..2ec880801 100644
--- a/examples/camera/videosettings.cpp
+++ b/examples/multimediawidgets/camera/videosettings.cpp
diff --git a/examples/camera/videosettings.h b/examples/multimediawidgets/camera/videosettings.h
index 32b519064..32b519064 100644
--- a/examples/camera/videosettings.h
+++ b/examples/multimediawidgets/camera/videosettings.h
diff --git a/examples/camera/videosettings.ui b/examples/multimediawidgets/camera/videosettings.ui
index f6aa004c5..f6aa004c5 100644
--- a/examples/camera/videosettings.ui
+++ b/examples/multimediawidgets/camera/videosettings.ui
diff --git a/examples/customvideosurface/customvideoitem/customvideoitem.pro b/examples/multimediawidgets/customvideosurface/customvideoitem/customvideoitem.pro
index 705038985..387e494c9 100644
--- a/examples/customvideosurface/customvideoitem/customvideoitem.pro
+++ b/examples/multimediawidgets/customvideosurface/customvideoitem/customvideoitem.pro
@@ -12,8 +12,5 @@ SOURCES   += main.cpp \
              videoplayer.cpp \
              videoitem.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideosurface/customvideoitem
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/customvideosurface/customvideoitem
-
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/customvideosurface/customvideoitem
+INSTALLS += target
diff --git a/examples/customvideosurface/customvideoitem/main.cpp b/examples/multimediawidgets/customvideosurface/customvideoitem/main.cpp
index 18f602f88..18f602f88 100644
--- a/examples/customvideosurface/customvideoitem/main.cpp
+++ b/examples/multimediawidgets/customvideosurface/customvideoitem/main.cpp
diff --git a/examples/customvideosurface/customvideoitem/videoitem.cpp b/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.cpp
index db6651efd..db6651efd 100644
--- a/examples/customvideosurface/customvideoitem/videoitem.cpp
+++ b/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.cpp
diff --git a/examples/customvideosurface/customvideoitem/videoitem.h b/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.h
index 28360577b..28360577b 100644
--- a/examples/customvideosurface/customvideoitem/videoitem.h
+++ b/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.h
diff --git a/examples/customvideosurface/customvideoitem/videoplayer.cpp b/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.cpp
index c76160da3..c76160da3 100644
--- a/examples/customvideosurface/customvideoitem/videoplayer.cpp
+++ b/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.cpp
diff --git a/examples/customvideosurface/customvideoitem/videoplayer.h b/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.h
index 5b4db4e4d..5b4db4e4d 100644
--- a/examples/customvideosurface/customvideoitem/videoplayer.h
+++ b/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.h
diff --git a/examples/multimediawidgets/customvideosurface/customvideosurface.pro b/examples/multimediawidgets/customvideosurface/customvideosurface.pro
new file mode 100644
index 000000000..baffdaba7
--- /dev/null
+++ b/examples/multimediawidgets/customvideosurface/customvideosurface.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+
+SUBDIRS += customvideoitem customvideowidget
+
diff --git a/examples/multimediawidgets/customvideosurface/customvideowidget/customvideowidget.pro b/examples/multimediawidgets/customvideosurface/customvideowidget/customvideowidget.pro
new file mode 100644
index 000000000..b4476dfb7
--- /dev/null
+++ b/examples/multimediawidgets/customvideosurface/customvideowidget/customvideowidget.pro
@@ -0,0 +1,18 @@
+TEMPLATE = app
+TARGET = customvideowidget
+
+QT += multimedia multimediawidgets widgets
+
+HEADERS = \
+    videoplayer.h \
+    videowidget.h \
+    videowidgetsurface.h
+
+SOURCES = \
+    main.cpp \
+    videoplayer.cpp \
+    videowidget.cpp \
+    videowidgetsurface.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/customvideosurface/customvideowidget
+INSTALLS += target
diff --git a/examples/customvideosurface/customvideowidget/main.cpp b/examples/multimediawidgets/customvideosurface/customvideowidget/main.cpp
index 8b7aba641..8b7aba641 100644
--- a/examples/customvideosurface/customvideowidget/main.cpp
+++ b/examples/multimediawidgets/customvideosurface/customvideowidget/main.cpp
diff --git a/examples/customvideosurface/customvideowidget/videoplayer.cpp b/examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.cpp
index 639c32461..639c32461 100644
--- a/examples/customvideosurface/customvideowidget/videoplayer.cpp
+++ b/examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.cpp
diff --git a/examples/customvideosurface/customvideowidget/videoplayer.h b/examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.h
index 7aff44fbb..7aff44fbb 100644
--- a/examples/customvideosurface/customvideowidget/videoplayer.h
+++ b/examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.h
diff --git a/examples/customvideosurface/customvideowidget/videowidget.cpp b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp
index 38c386e6e..38c386e6e 100644
--- a/examples/customvideosurface/customvideowidget/videowidget.cpp
+++ b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp
diff --git a/examples/customvideosurface/customvideowidget/videowidget.h b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.h
index 9b9bd0f38..9b9bd0f38 100644
--- a/examples/customvideosurface/customvideowidget/videowidget.h
+++ b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.h
diff --git a/examples/customvideosurface/customvideowidget/videowidgetsurface.cpp b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.cpp
index df157206b..df157206b 100644
--- a/examples/customvideosurface/customvideowidget/videowidgetsurface.cpp
+++ b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.cpp
diff --git a/examples/customvideosurface/customvideowidget/videowidgetsurface.h b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.h
index 3e9c40bd2..3e9c40bd2 100644
--- a/examples/customvideosurface/customvideowidget/videowidgetsurface.h
+++ b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.h
diff --git a/examples/declarative-camera/CameraButton.qml b/examples/multimediawidgets/declarative-camera/CameraButton.qml
index b4e399a49..b4e399a49 100644
--- a/examples/declarative-camera/CameraButton.qml
+++ b/examples/multimediawidgets/declarative-camera/CameraButton.qml
diff --git a/examples/declarative-camera/CameraPropertyButton.qml b/examples/multimediawidgets/declarative-camera/CameraPropertyButton.qml
index 75df17c8d..75df17c8d 100644
--- a/examples/declarative-camera/CameraPropertyButton.qml
+++ b/examples/multimediawidgets/declarative-camera/CameraPropertyButton.qml
diff --git a/examples/declarative-camera/CameraPropertyPopup.qml b/examples/multimediawidgets/declarative-camera/CameraPropertyPopup.qml
index ae78b7f6a..ae78b7f6a 100644
--- a/examples/declarative-camera/CameraPropertyPopup.qml
+++ b/examples/multimediawidgets/declarative-camera/CameraPropertyPopup.qml
diff --git a/examples/declarative-camera/FocusButton.qml b/examples/multimediawidgets/declarative-camera/FocusButton.qml
index 7f588826b..7f588826b 100644
--- a/examples/declarative-camera/FocusButton.qml
+++ b/examples/multimediawidgets/declarative-camera/FocusButton.qml
diff --git a/examples/declarative-camera/PhotoCaptureControls.qml b/examples/multimediawidgets/declarative-camera/PhotoCaptureControls.qml
index ccd14a084..ccd14a084 100644
--- a/examples/declarative-camera/PhotoCaptureControls.qml
+++ b/examples/multimediawidgets/declarative-camera/PhotoCaptureControls.qml
diff --git a/examples/declarative-camera/PhotoPreview.qml b/examples/multimediawidgets/declarative-camera/PhotoPreview.qml
index f392d3b9f..f392d3b9f 100644
--- a/examples/declarative-camera/PhotoPreview.qml
+++ b/examples/multimediawidgets/declarative-camera/PhotoPreview.qml
diff --git a/examples/declarative-camera/VideoCaptureControls.qml b/examples/multimediawidgets/declarative-camera/VideoCaptureControls.qml
index c40365e47..c40365e47 100644
--- a/examples/declarative-camera/VideoCaptureControls.qml
+++ b/examples/multimediawidgets/declarative-camera/VideoCaptureControls.qml
diff --git a/examples/declarative-camera/VideoPreview.qml b/examples/multimediawidgets/declarative-camera/VideoPreview.qml
index dc9eb0b55..dc9eb0b55 100644
--- a/examples/declarative-camera/VideoPreview.qml
+++ b/examples/multimediawidgets/declarative-camera/VideoPreview.qml
diff --git a/examples/declarative-camera/ZoomControl.qml b/examples/multimediawidgets/declarative-camera/ZoomControl.qml
index a4847baa6..a4847baa6 100644
--- a/examples/declarative-camera/ZoomControl.qml
+++ b/examples/multimediawidgets/declarative-camera/ZoomControl.qml
diff --git a/examples/multimediawidgets/declarative-camera/declarative-camera.pro b/examples/multimediawidgets/declarative-camera/declarative-camera.pro
new file mode 100644
index 000000000..5fb0a1b51
--- /dev/null
+++ b/examples/multimediawidgets/declarative-camera/declarative-camera.pro
@@ -0,0 +1,11 @@
+TEMPLATE=app
+TARGET=declarative-camera
+
+QT += quick qml multimedia
+
+SOURCES += qmlcamera.cpp
+RESOURCES += declarative-camera.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/declarative-camera
+INSTALLS += target
+
diff --git a/examples/declarative-camera/declarative-camera.qml b/examples/multimediawidgets/declarative-camera/declarative-camera.qml
index 7f0f21900..7f0f21900 100644
--- a/examples/declarative-camera/declarative-camera.qml
+++ b/examples/multimediawidgets/declarative-camera/declarative-camera.qml
diff --git a/examples/declarative-camera/declarative-camera.qmlproject b/examples/multimediawidgets/declarative-camera/declarative-camera.qmlproject
index 53f5ecb8d..53f5ecb8d 100644
--- a/examples/declarative-camera/declarative-camera.qmlproject
+++ b/examples/multimediawidgets/declarative-camera/declarative-camera.qmlproject
diff --git a/examples/multimediawidgets/declarative-camera/declarative-camera.qrc b/examples/multimediawidgets/declarative-camera/declarative-camera.qrc
new file mode 100644
index 000000000..d99b86c0c
--- /dev/null
+++ b/examples/multimediawidgets/declarative-camera/declarative-camera.qrc
@@ -0,0 +1,26 @@
+<RCC>
+    <qresource prefix="/">
+        <file>PhotoPreview.qml</file>
+        <file>ZoomControl.qml</file>
+        <file>VideoCaptureControls.qml</file>
+        <file>VideoPreview.qml</file>
+        <file>FocusButton.qml</file>
+        <file>PhotoCaptureControls.qml</file>
+        <file>declarative-camera.qml</file>
+        <file>CameraPropertyPopup.qml</file>
+        <file>CameraPropertyButton.qml</file>
+        <file>CameraButton.qml</file>
+        <file>images/camera_auto_mode.png</file>
+        <file>images/camera_camera_setting.png</file>
+        <file>images/camera_flash_auto.png</file>
+        <file>images/camera_flash_fill.png</file>
+        <file>images/camera_flash_off.png</file>
+        <file>images/camera_flash_redeye.png</file>
+        <file>images/camera_white_balance_cloudy.png</file>
+        <file>images/camera_white_balance_flourescent.png</file>
+        <file>images/camera_white_balance_incandescent.png</file>
+        <file>images/camera_white_balance_sunny.png</file>
+        <file>images/toolbutton.png</file>
+        <file>images/toolbutton.sci</file>
+    </qresource>
+</RCC>
diff --git a/examples/declarative-camera/doc/images/qml-camera.png b/examples/multimediawidgets/declarative-camera/doc/images/qml-camera.png
index 0cd61f0a0..0cd61f0a0 100644
--- a/examples/declarative-camera/doc/images/qml-camera.png
+++ b/examples/multimediawidgets/declarative-camera/doc/images/qml-camera.png
diff --git a/examples/declarative-camera/doc/src/declarative-camera.qdoc b/examples/multimediawidgets/declarative-camera/doc/src/declarative-camera.qdoc
index 37f35ea26..c98688b00 100644
--- a/examples/declarative-camera/doc/src/declarative-camera.qdoc
+++ b/examples/multimediawidgets/declarative-camera/doc/src/declarative-camera.qdoc
@@ -26,10 +26,9 @@
 ****************************************************************************/
 
 /*!
-\example declarative-camera
+\example multimediawidgets/declarative-camera
 \title QML Camera Example
-\ingroup camera_examples_qml
-
+\ingroup multimedia_examples
 \brief  The Camera Example shows how to use the API to capture a still image
 or video.
 
diff --git a/examples/declarative-camera/images/camera_auto_mode.png b/examples/multimediawidgets/declarative-camera/images/camera_auto_mode.png
index f168296cf..f168296cf 100644
--- a/examples/declarative-camera/images/camera_auto_mode.png
+++ b/examples/multimediawidgets/declarative-camera/images/camera_auto_mode.png
diff --git a/examples/declarative-camera/images/camera_camera_setting.png b/examples/multimediawidgets/declarative-camera/images/camera_camera_setting.png
index 7b993eee9..7b993eee9 100644
--- a/examples/declarative-camera/images/camera_camera_setting.png
+++ b/examples/multimediawidgets/declarative-camera/images/camera_camera_setting.png
diff --git a/examples/declarative-camera/images/camera_flash_auto.png b/examples/multimediawidgets/declarative-camera/images/camera_flash_auto.png
index fb5cc40ec..fb5cc40ec 100644
--- a/examples/declarative-camera/images/camera_flash_auto.png
+++ b/examples/multimediawidgets/declarative-camera/images/camera_flash_auto.png
diff --git a/examples/declarative-camera/images/camera_flash_fill.png b/examples/multimediawidgets/declarative-camera/images/camera_flash_fill.png
index 7bc5949ac..7bc5949ac 100644
--- a/examples/declarative-camera/images/camera_flash_fill.png
+++ b/examples/multimediawidgets/declarative-camera/images/camera_flash_fill.png
diff --git a/examples/declarative-camera/images/camera_flash_off.png b/examples/multimediawidgets/declarative-camera/images/camera_flash_off.png
index 3c5db10cc..3c5db10cc 100644
--- a/examples/declarative-camera/images/camera_flash_off.png
+++ b/examples/multimediawidgets/declarative-camera/images/camera_flash_off.png
diff --git a/examples/declarative-camera/images/camera_flash_redeye.png b/examples/multimediawidgets/declarative-camera/images/camera_flash_redeye.png
index 534a087df..534a087df 100644
--- a/examples/declarative-camera/images/camera_flash_redeye.png
+++ b/examples/multimediawidgets/declarative-camera/images/camera_flash_redeye.png
diff --git a/examples/declarative-camera/images/camera_white_balance_cloudy.png b/examples/multimediawidgets/declarative-camera/images/camera_white_balance_cloudy.png
index 243b699e7..243b699e7 100644
--- a/examples/declarative-camera/images/camera_white_balance_cloudy.png
+++ b/examples/multimediawidgets/declarative-camera/images/camera_white_balance_cloudy.png
diff --git a/examples/declarative-camera/images/camera_white_balance_flourescent.png b/examples/multimediawidgets/declarative-camera/images/camera_white_balance_flourescent.png
index 032efe1d1..032efe1d1 100644
--- a/examples/declarative-camera/images/camera_white_balance_flourescent.png
+++ b/examples/multimediawidgets/declarative-camera/images/camera_white_balance_flourescent.png
diff --git a/examples/declarative-camera/images/camera_white_balance_incandescent.png b/examples/multimediawidgets/declarative-camera/images/camera_white_balance_incandescent.png
index 98f906741..98f906741 100644
--- a/examples/declarative-camera/images/camera_white_balance_incandescent.png
+++ b/examples/multimediawidgets/declarative-camera/images/camera_white_balance_incandescent.png
diff --git a/examples/declarative-camera/images/camera_white_balance_sunny.png b/examples/multimediawidgets/declarative-camera/images/camera_white_balance_sunny.png
index d7d5c9a36..d7d5c9a36 100644
--- a/examples/declarative-camera/images/camera_white_balance_sunny.png
+++ b/examples/multimediawidgets/declarative-camera/images/camera_white_balance_sunny.png
diff --git a/examples/declarative-camera/images/toolbutton.png b/examples/multimediawidgets/declarative-camera/images/toolbutton.png
index 11310013e..11310013e 100644
--- a/examples/declarative-camera/images/toolbutton.png
+++ b/examples/multimediawidgets/declarative-camera/images/toolbutton.png
diff --git a/examples/declarative-camera/images/toolbutton.sci b/examples/multimediawidgets/declarative-camera/images/toolbutton.sci
index 9e4f96530..9e4f96530 100644
--- a/examples/declarative-camera/images/toolbutton.sci
+++ b/examples/multimediawidgets/declarative-camera/images/toolbutton.sci
diff --git a/examples/declarative-camera/qmlcamera.cpp b/examples/multimediawidgets/declarative-camera/qmlcamera.cpp
index 0d8dbc462..3da615650 100644
--- a/examples/declarative-camera/qmlcamera.cpp
+++ b/examples/multimediawidgets/declarative-camera/qmlcamera.cpp
@@ -50,8 +50,7 @@ int main(int argc, char* argv[])
     // Qt.quit() called in embedded .qml by default only emits
     // quit() signal, so do this (optionally use Qt.exit()).
     QObject::connect(view.engine(), SIGNAL(quit()), qApp, SLOT(quit()));
-    view.setSource(QUrl::fromLocalFile(QCoreApplication::applicationDirPath() +
-                                       QLatin1String("/declarative-camera.qml")));
+    view.setSource(QUrl("qrc:///declarative-camera.qml"));
     view.resize(800, 480);
     view.show();
     return app.exec();
diff --git a/examples/multimediawidgets/multimediawidgets.pro b/examples/multimediawidgets/multimediawidgets.pro
new file mode 100644
index 000000000..b14ddd263
--- /dev/null
+++ b/examples/multimediawidgets/multimediawidgets.pro
@@ -0,0 +1,16 @@
+TEMPLATE = subdirs
+
+# These examples all need widgets for now (using creator templates that use widgets)
+!isEmpty(QT.widgets.name) {
+    SUBDIRS += \
+        camera \
+        videographicsitem \
+        videowidget \
+        player \
+        customvideosurface
+}
+
+!isEmpty(QT.gui.name):!isEmpty(QT.qml.name) {
+    disabled:SUBDIRS += declarative-camera
+}
+
diff --git a/examples/player/doc/src/player.qdoc b/examples/multimediawidgets/player/doc/src/player.qdoc
index 5e98b912c..5522425c7 100644
--- a/examples/player/doc/src/player.qdoc
+++ b/examples/multimediawidgets/player/doc/src/player.qdoc
@@ -26,10 +26,10 @@
 ****************************************************************************/
 
 /*!
-    \example player
+    \example multimediawidgets/player
     \title Media Player Example
-    \ingroup video_examples
-
+    \ingroup multimedia_examples
+    \brief Demonstrates the audio and video playback functionality
 
     This example creates a simple multimedia player. We can play audio and
     or video files using various codecs.
diff --git a/examples/player/histogramwidget.cpp b/examples/multimediawidgets/player/histogramwidget.cpp
index 7d4e63a58..7d4e63a58 100644
--- a/examples/player/histogramwidget.cpp
+++ b/examples/multimediawidgets/player/histogramwidget.cpp
diff --git a/examples/player/histogramwidget.h b/examples/multimediawidgets/player/histogramwidget.h
index 6a8aa16fe..6a8aa16fe 100644
--- a/examples/player/histogramwidget.h
+++ b/examples/multimediawidgets/player/histogramwidget.h
diff --git a/examples/player/main.cpp b/examples/multimediawidgets/player/main.cpp
index 4754a03e2..4754a03e2 100644
--- a/examples/player/main.cpp
+++ b/examples/multimediawidgets/player/main.cpp
diff --git a/examples/player/player.cpp b/examples/multimediawidgets/player/player.cpp
index fbc3e575e..fbc3e575e 100644
--- a/examples/player/player.cpp
+++ b/examples/multimediawidgets/player/player.cpp
diff --git a/examples/player/player.h b/examples/multimediawidgets/player/player.h
index 66f1b1679..66f1b1679 100644
--- a/examples/player/player.h
+++ b/examples/multimediawidgets/player/player.h
diff --git a/examples/player/player.pro b/examples/multimediawidgets/player/player.pro
index 2504f3612..067b31b11 100644
--- a/examples/player/player.pro
+++ b/examples/multimediawidgets/player/player.pro
@@ -24,7 +24,5 @@ maemo* {
     DEFINES += PLAYER_NO_COLOROPTIONS
 }
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/player
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/player
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/player
+INSTALLS += target
diff --git a/examples/player/playercontrols.cpp b/examples/multimediawidgets/player/playercontrols.cpp
index 1f18fc0cd..1f18fc0cd 100644
--- a/examples/player/playercontrols.cpp
+++ b/examples/multimediawidgets/player/playercontrols.cpp
diff --git a/examples/player/playercontrols.h b/examples/multimediawidgets/player/playercontrols.h
index 35ae30252..35ae30252 100644
--- a/examples/player/playercontrols.h
+++ b/examples/multimediawidgets/player/playercontrols.h
diff --git a/examples/player/playlistmodel.cpp b/examples/multimediawidgets/player/playlistmodel.cpp
index bf10153e3..bf10153e3 100644
--- a/examples/player/playlistmodel.cpp
+++ b/examples/multimediawidgets/player/playlistmodel.cpp
diff --git a/examples/player/playlistmodel.h b/examples/multimediawidgets/player/playlistmodel.h
index 59d202818..59d202818 100644
--- a/examples/player/playlistmodel.h
+++ b/examples/multimediawidgets/player/playlistmodel.h
diff --git a/examples/player/videowidget.cpp b/examples/multimediawidgets/player/videowidget.cpp
index 5e07bd398..5e07bd398 100644
--- a/examples/player/videowidget.cpp
+++ b/examples/multimediawidgets/player/videowidget.cpp
diff --git a/examples/player/videowidget.h b/examples/multimediawidgets/player/videowidget.h
index 9a520e7ee..9a520e7ee 100644
--- a/examples/player/videowidget.h
+++ b/examples/multimediawidgets/player/videowidget.h
diff --git a/examples/videographicsitem/doc/images/video-videographicsitem.png b/examples/multimediawidgets/videographicsitem/doc/images/video-videographicsitem.png
index e333c54a2..e333c54a2 100644
--- a/examples/videographicsitem/doc/images/video-videographicsitem.png
+++ b/examples/multimediawidgets/videographicsitem/doc/images/video-videographicsitem.png
diff --git a/examples/videographicsitem/doc/src/videographicsitem.qdoc b/examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc
index c1eb0ccc7..6deca4ce6 100644
--- a/examples/videographicsitem/doc/src/videographicsitem.qdoc
+++ b/examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc
@@ -26,9 +26,9 @@
 ****************************************************************************/
 
 /*!
-\example videographicsitem
+\example multimediawidgets/videographicsitem
 \title Video Graphics Item Example
-\ingroup video_examples
+\ingroup multimedia_examples
 \brief This example demonstrates how to stream video on a graphics scene.
 
     The Video Graphics Item example shows how to implement a QGraphicsItem that displays video on a
diff --git a/examples/videographicsitem/main.cpp b/examples/multimediawidgets/videographicsitem/main.cpp
index c8920adce..c8920adce 100644
--- a/examples/videographicsitem/main.cpp
+++ b/examples/multimediawidgets/videographicsitem/main.cpp
diff --git a/examples/multimediawidgets/videographicsitem/videographicsitem.pro b/examples/multimediawidgets/videographicsitem/videographicsitem.pro
new file mode 100644
index 000000000..30a9b6f21
--- /dev/null
+++ b/examples/multimediawidgets/videographicsitem/videographicsitem.pro
@@ -0,0 +1,14 @@
+TEMPLATE = app
+TARGET = videographicsitem
+
+QT += multimedia multimediawidgets
+
+HEADERS   += videoplayer.h
+
+SOURCES   += main.cpp \
+             videoplayer.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/videographicsitem
+INSTALLS += target
+
+QT+=widgets
diff --git a/examples/videographicsitem/videoplayer.cpp b/examples/multimediawidgets/videographicsitem/videoplayer.cpp
index caf84cdf5..caf84cdf5 100644
--- a/examples/videographicsitem/videoplayer.cpp
+++ b/examples/multimediawidgets/videographicsitem/videoplayer.cpp
diff --git a/examples/videographicsitem/videoplayer.h b/examples/multimediawidgets/videographicsitem/videoplayer.h
index a958b8123..a958b8123 100644
--- a/examples/videographicsitem/videoplayer.h
+++ b/examples/multimediawidgets/videographicsitem/videoplayer.h
diff --git a/examples/videowidget/doc/images/video-videowidget.png b/examples/multimediawidgets/videowidget/doc/images/video-videowidget.png
index a3c7bcb44..a3c7bcb44 100644
--- a/examples/videowidget/doc/images/video-videowidget.png
+++ b/examples/multimediawidgets/videowidget/doc/images/video-videowidget.png
diff --git a/examples/videowidget/doc/src/videowidget.qdoc b/examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc
index 860cb7ac5..9a95f0ca5 100644
--- a/examples/videowidget/doc/src/videowidget.qdoc
+++ b/examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc
@@ -26,9 +26,9 @@
 ****************************************************************************/
 
 /*!
-    \example videowidget
+    \example multimediawidgets/videowidget
     \title Video Widget Example
-    \ingroup video_examples
+    \ingroup multimedia_examples
     \brief This example is a simple video player
 
     The Video Widget example denonstrates how to implement a video widget using
diff --git a/examples/videowidget/main.cpp b/examples/multimediawidgets/videowidget/main.cpp
index b0d83d010..b0d83d010 100644
--- a/examples/videowidget/main.cpp
+++ b/examples/multimediawidgets/videowidget/main.cpp
diff --git a/examples/videowidget/videoplayer.cpp b/examples/multimediawidgets/videowidget/videoplayer.cpp
index d961a63ff..4083543e5 100644
--- a/examples/videowidget/videoplayer.cpp
+++ b/examples/multimediawidgets/videowidget/videoplayer.cpp
@@ -49,6 +49,7 @@ VideoPlayer::VideoPlayer(QWidget *parent)
     , mediaPlayer(0, QMediaPlayer::VideoSurface)
     , playButton(0)
     , positionSlider(0)
+    , errorLabel(0)
 {
     QVideoWidget *videoWidget = new QVideoWidget;
 
@@ -68,6 +69,9 @@ VideoPlayer::VideoPlayer(QWidget *parent)
     connect(positionSlider, SIGNAL(sliderMoved(int)),
             this, SLOT(setPosition(int)));
 
+    errorLabel = new QLabel;
+    errorLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
+
     QBoxLayout *controlLayout = new QHBoxLayout;
     controlLayout->setMargin(0);
     controlLayout->addWidget(openButton);
@@ -77,6 +81,7 @@ VideoPlayer::VideoPlayer(QWidget *parent)
     QBoxLayout *layout = new QVBoxLayout;
     layout->addWidget(videoWidget);
     layout->addLayout(controlLayout);
+    layout->addWidget(errorLabel);
 
     setLayout(layout);
 
@@ -85,6 +90,7 @@ VideoPlayer::VideoPlayer(QWidget *parent)
             this, SLOT(mediaStateChanged(QMediaPlayer::State)));
     connect(&mediaPlayer, SIGNAL(positionChanged(qint64)), this, SLOT(positionChanged(qint64)));
     connect(&mediaPlayer, SIGNAL(durationChanged(qint64)), this, SLOT(durationChanged(qint64)));
+    connect(&mediaPlayer, SIGNAL(error(QMediaPlayer::Error)), this, SLOT(handleError()));
 }
 
 VideoPlayer::~VideoPlayer()
@@ -93,11 +99,12 @@ VideoPlayer::~VideoPlayer()
 
 void VideoPlayer::openFile()
 {
+    errorLabel->setText("");
+
     QString fileName = QFileDialog::getOpenFileName(this, tr("Open Movie"),QDir::homePath());
 
     if (!fileName.isEmpty()) {
         mediaPlayer.setMedia(QUrl::fromLocalFile(fileName));
-
         playButton->setEnabled(true);
     }
 }
@@ -140,3 +147,9 @@ void VideoPlayer::setPosition(int position)
 {
     mediaPlayer.setPosition(position);
 }
+
+void VideoPlayer::handleError()
+{
+    playButton->setEnabled(false);
+    errorLabel->setText("Error: " + mediaPlayer.errorString());
+}
diff --git a/examples/videowidget/videoplayer.h b/examples/multimediawidgets/videowidget/videoplayer.h
index ddad18724..0bd720bfc 100644
--- a/examples/videowidget/videoplayer.h
+++ b/examples/multimediawidgets/videowidget/videoplayer.h
@@ -49,6 +49,7 @@
 QT_BEGIN_NAMESPACE
 class QAbstractButton;
 class QSlider;
+class QLabel;
 QT_END_NAMESPACE
 
 class VideoPlayer : public QWidget
@@ -67,11 +68,13 @@ private slots:
     void positionChanged(qint64 position);
     void durationChanged(qint64 duration);
     void setPosition(int position);
+    void handleError();
 
 private:
     QMediaPlayer mediaPlayer;
     QAbstractButton *playButton;
     QSlider *positionSlider;
+    QLabel *errorLabel;
 };
 
 #endif
diff --git a/examples/multimediawidgets/videowidget/videowidget.pro b/examples/multimediawidgets/videowidget/videowidget.pro
new file mode 100644
index 000000000..603996b2e
--- /dev/null
+++ b/examples/multimediawidgets/videowidget/videowidget.pro
@@ -0,0 +1,16 @@
+TEMPLATE = app
+TARGET = videowidget
+
+QT += multimedia multimediawidgets
+
+HEADERS = \
+    videoplayer.h
+
+SOURCES = \
+    main.cpp \
+    videoplayer.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/videowidget
+INSTALLS += target
+
+QT+=widgets
diff --git a/examples/radio/radio.pro b/examples/radio/radio.pro
deleted file mode 100644
index 6931879dd..000000000
--- a/examples/radio/radio.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-TEMPLATE = app
-TARGET = radio
-
-QT += multimedia
-
-HEADERS = \
-    radio.h
-  
-SOURCES = \
-    main.cpp \
-    radio.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/radio
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/radio
-
-INSTALLS += target sources
-
-QT+=widgets
diff --git a/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri b/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri
deleted file mode 100644
index 75d66c36b..000000000
--- a/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri
+++ /dev/null
@@ -1,5 +0,0 @@
-QT += qml quick
-
-SOURCES += $$PWD/qmlapplicationviewer.cpp
-HEADERS += $$PWD/qmlapplicationviewer.h
-INCLUDEPATH += $$PWD
diff --git a/examples/video/qmlvideo/qmlvideo.pro b/examples/video/qmlvideo/qmlvideo.pro
deleted file mode 100644
index 737d04046..000000000
--- a/examples/video/qmlvideo/qmlvideo.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-TEMPLATE = app
-TARGET = qmlvideo
-
-LOCAL_SOURCES = main.cpp
-LOCAL_HEADERS = trace.h
-
-SOURCES += $$LOCAL_SOURCES
-HEADERS += $$LOCAL_HEADERS
-RESOURCES += qmlvideo.qrc
-
-SNIPPETS_PATH = ../snippets
-include($$SNIPPETS_PATH/performancemonitor/performancemonitordeclarative.pri)
-
-include(qmlapplicationviewer/qmlapplicationviewer.pri)
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/video/qmlvideo
-sources.files = $$LOCAL_SOURCES $$LOCAL_HEADERS $$RESOURCES *.pro images qmlapplicationviewer qmlvideo.png qml qmlvideo.svg
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/video/qmlvideo
-INSTALLS += target sources
-
diff --git a/examples/video/qmlvideo/qmlvideo.qrc b/examples/video/qmlvideo/qmlvideo.qrc
deleted file mode 100644
index 4896b336f..000000000
--- a/examples/video/qmlvideo/qmlvideo.qrc
+++ /dev/null
@@ -1,12 +0,0 @@
-<RCC>
-    <qresource prefix="/images">
-        <file alias="leaves.jpg">images/leaves.jpg</file>
-        <file alias="close.png">images/close.png</file>
-        <file alias="folder.png">images/folder.png</file>
-        <file alias="titlebar.png">images/titlebar.png</file>
-        <file alias="titlebar.sci">images/titlebar.sci</file>
-        <file alias="up.png">images/up.png</file>
-        <file alias="progress_handle.svg">images/progress_handle.svg</file>
-        <file alias="progress_handle_pressed.svg">images/progress_handle_pressed.svg</file>
-    </qresource>
-</RCC>
diff --git a/examples/video/qmlvideofx/filereader.cpp b/examples/video/qmlvideofx/filereader.cpp
deleted file mode 100644
index 065766323..000000000
--- a/examples/video/qmlvideofx/filereader.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "filereader.h"
-#include "trace.h"
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTextStream>
-
-QString adjustPath(const QString &path)
-{
-#ifdef Q_OS_UNIX
-#ifdef Q_OS_MAC
-    if (!QDir::isAbsolutePath(path))
-        return QCoreApplication::applicationDirPath()
-                + QLatin1String("/../Resources/") + path;
-#else
-    QString pathInInstallDir;
-    const QString applicationDirPath = QCoreApplication::applicationDirPath();
-    pathInInstallDir = QString::fromLatin1("%1/../%2").arg(applicationDirPath, path);
-
-    if (QFileInfo(pathInInstallDir).exists())
-        return pathInInstallDir;
-#endif
-#endif
-    return path;
-}
-
-QString FileReader::readFile(const QString &fileName)
-{
-    qtTrace() << "FileReader::readFile" << "fileName" << fileName;
-    QString content;
-    QFile file(adjustPath(fileName));
-    if (file.open(QIODevice::ReadOnly)) {
-        QTextStream stream(&file);
-        content = stream.readAll();
-    }
-    return content;
-}
-
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml b/examples/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml
deleted file mode 100644
index b1f214b07..000000000
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Effect {
-    fragmentShaderFilename: "shaders/tiltshift.fsh"
-}
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml b/examples/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml
deleted file mode 100644
index 11201616c..000000000
--- a/examples/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Effect {
-    fragmentShaderFilename: "shaders/vignette.fsh"
-}
diff --git a/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp
deleted file mode 100644
index 2ffc0b219..000000000
--- a/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlapplicationviewer.h"
-
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtQml/QQmlComponent>
-#include <QtQml/QQmlEngine>
-#include <QtQml/QQmlContext>
-#include <QtGui/QGuiApplication>
-
-class QmlApplicationViewerPrivate
-{
-    QmlApplicationViewerPrivate(QQuickView *view_) : view(view_) {}
-
-    QString mainQmlFile;
-    QQuickView *view;
-    friend class QmlApplicationViewer;
-    QString adjustPath(const QString &path);
-};
-
-QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
-{
-#ifdef Q_OS_UNIX
-#ifdef Q_OS_MAC
-    if (!QDir::isAbsolutePath(path))
-        return QCoreApplication::applicationDirPath()
-                + QLatin1String("/../Resources/") + path;
-#else
-    QString pathInInstallDir;
-    const QString applicationDirPath = QCoreApplication::applicationDirPath();
-    pathInInstallDir = QString::fromLatin1("%1/../%2").arg(applicationDirPath, path);
-
-    if (QFileInfo(pathInInstallDir).exists())
-        return pathInInstallDir;
-#endif
-#endif
-    return path;
-}
-
-QmlApplicationViewer::QmlApplicationViewer(QWindow *parent)
-    : QQuickView(parent)
-    , d(new QmlApplicationViewerPrivate(this))
-{
-    connect(engine(), SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit()));
-    setResizeMode(QQuickView::SizeRootObjectToView);
-}
-
-QmlApplicationViewer::QmlApplicationViewer(QQuickView *view, QWindow *parent)
-    : QQuickView(parent)
-    , d(new QmlApplicationViewerPrivate(view))
-{
-    connect(view->engine(), SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit()));
-    view->setResizeMode(QQuickView::SizeRootObjectToView);
-}
-
-QmlApplicationViewer::~QmlApplicationViewer()
-{
-    delete d;
-}
-
-QmlApplicationViewer *QmlApplicationViewer::create()
-{
-    return new QmlApplicationViewer();
-}
-
-void QmlApplicationViewer::setMainQmlFile(const QString &file)
-{
-    d->mainQmlFile = d->adjustPath(file);
-    d->view->setSource(QUrl::fromLocalFile(d->mainQmlFile));
-}
-
-void QmlApplicationViewer::addImportPath(const QString &path)
-{
-    d->view->engine()->addImportPath(d->adjustPath(path));
-}
-
-void QmlApplicationViewer::showExpanded()
-{
-#if defined(Q_WS_SIMULATOR)
-    d->view->showFullScreen();
-#else
-    d->view->show();
-#endif
-}
-
-QGuiApplication *createApplication(int &argc, char **argv)
-{
-    return new QGuiApplication(argc, argv);
-}
diff --git a/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.h b/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.h
deleted file mode 100644
index a4eabdba8..000000000
--- a/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLAPPLICATIONVIEWER_H
-#define QMLAPPLICATIONVIEWER_H
-
-#include <QtQuick/QQuickView>
-#include <QtGui/QGuiApplication>
-
-class QmlApplicationViewer : public QQuickView
-{
-    Q_OBJECT
-
-public:
-    explicit QmlApplicationViewer(QWindow *parent = 0);
-    virtual ~QmlApplicationViewer();
-
-    static QmlApplicationViewer *create();
-
-    void setMainQmlFile(const QString &file);
-    void addImportPath(const QString &path);
-
-    void showExpanded();
-
-private:
-    explicit QmlApplicationViewer(QQuickView *view, QWindow *parent);
-    class QmlApplicationViewerPrivate *d;
-};
-
-QGuiApplication *createApplication(int &argc, char **argv);
-
-#endif // QMLAPPLICATIONVIEWER_H
diff --git a/examples/video/qmlvideofx/qmlvideofx.pro b/examples/video/qmlvideofx/qmlvideofx.pro
deleted file mode 100644
index d556fd77c..000000000
--- a/examples/video/qmlvideofx/qmlvideofx.pro
+++ /dev/null
@@ -1,26 +0,0 @@
-TEMPLATE = app
-TARGET = qmlvideofx
-
-LOCAL_SOURCES = filereader.cpp main.cpp
-LOCAL_HEADERS = filereader.h trace.h
-
-SOURCES += $$LOCAL_SOURCES
-HEADERS += $$LOCAL_HEADERS
-
-RESOURCES += qmlvideofx.qrc
-
-SNIPPETS_PATH = ../snippets
-include($$SNIPPETS_PATH/performancemonitor/performancemonitordeclarative.pri)
-
-maemo6: {
-    DEFINES += SMALL_SCREEN_LAYOUT
-    DEFINES += SMALL_SCREEN_PHYSICAL
-}
-
-include(qmlapplicationviewer/qmlapplicationviewer.pri)
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/video/qmlvideofx
-sources.files = $$LOCAL_SOURCES $$LOCAL_HEADERS $$RESOURCES *.pro images qmlapplicationviewer qmlvideofx.png shaders qml qmlvideofx.svg
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/video/qmlvideofx
-INSTALLS += target sources
diff --git a/examples/video/qmlvideofx/qmlvideofx.qrc b/examples/video/qmlvideofx/qmlvideofx.qrc
deleted file mode 100644
index 6ca4ef54b..000000000
--- a/examples/video/qmlvideofx/qmlvideofx.qrc
+++ /dev/null
@@ -1,10 +0,0 @@
-<RCC>
-    <qresource prefix="/images">
-        <file alias="close.png">images/close.png</file>
-        <file alias="folder.png">images/folder.png</file>
-        <file alias="titlebar.png">images/titlebar.png</file>
-        <file alias="titlebar.sci">images/titlebar.sci</file>
-        <file alias="up.png">images/up.png</file>
-        <file alias="qt-logo.png">images/qt-logo.png</file>
-    </qresource>
-</RCC>
diff --git a/examples/video/snippets/performancemonitor/performancemonitor.cpp b/examples/video/snippets/performancemonitor/performancemonitor.cpp
deleted file mode 100644
index 9a7e060b7..000000000
--- a/examples/video/snippets/performancemonitor/performancemonitor.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "performancemonitor.h"
-
-namespace PerformanceMonitor {
-
-    bool parseArgument(const QString &arg, State &state)
-    {
-        bool result = false;
-        if ("-log-perf" == arg) {
-            state.logging = true;
-            state.valid = true;
-            result = true;
-        } else if ("-no-log-perf" == arg) {
-            state.logging = false;
-            state.valid = true;
-            result = true;
-        } else if ("-show-perf" == arg) {
-            state.visible = true;
-            state.valid = true;
-            result = true;
-        } else if ("-hide-perf" == arg) {
-            state.visible = false;
-            state.valid = true;
-            result = true;
-        }
-        return result;
-    }
-
-}
diff --git a/examples/video/video.pro b/examples/video/video.pro
deleted file mode 100644
index 96d48c0d3..000000000
--- a/examples/video/video.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += qmlvideo qmlvideofx
-
-# install
-sources.files = video.pro doc snippets
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/video
-INSTALLS += sources
diff --git a/examples/videographicsitem/videographicsitem.pro b/examples/videographicsitem/videographicsitem.pro
deleted file mode 100644
index c90383570..000000000
--- a/examples/videographicsitem/videographicsitem.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-TEMPLATE = app
-TARGET = videographicsitem
-
-QT += multimedia multimediawidgets
-
-HEADERS   += videoplayer.h
-
-SOURCES   += main.cpp \
-             videoplayer.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/videographicsitem
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/videographicsitem
-
-INSTALLS += target sources
-
-QT+=widgets
diff --git a/examples/videowidget/videowidget.pro b/examples/videowidget/videowidget.pro
deleted file mode 100644
index 914f48e31..000000000
--- a/examples/videowidget/videowidget.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-TEMPLATE = app
-TARGET = videowidget
-
-QT += multimedia multimediawidgets
-
-HEADERS = \
-    videoplayer.h
-
-SOURCES = \
-    main.cpp \
-    videoplayer.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/videowidget
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/videowidget
-
-INSTALLS += target sources
-
-QT+=widgets
diff --git a/src/gsttools/gsttools.pro b/src/gsttools/gsttools.pro
index 8672b1a70..eb1041ca3 100644
--- a/src/gsttools/gsttools.pro
+++ b/src/gsttools/gsttools.pro
@@ -32,7 +32,6 @@ config_resourcepolicy {
 # Header files must go inside source directory of a module
 # to be installed by syncqt.
 INCLUDEPATH += ../multimedia/gsttools_headers/
-DEPENDPATH += ../multimedia/gsttools_headers/
 VPATH += ../multimedia/gsttools_headers/
 
 PRIVATE_HEADERS += \
diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes
index 1fe849962..b2970649f 100644
--- a/src/imports/multimedia/plugins.qmltypes
+++ b/src/imports/multimedia/plugins.qmltypes
@@ -2,6 +2,8 @@ import QtQuick.tooling 1.1
 
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
+//
+// This file was auto-generated with the command 'qmlplugindump -notrelocatable QtMultimedia 5.0'.
 
 Module {
     Component {
@@ -80,65 +82,56 @@ Module {
         Property { name: "lockStatus"; type: "QCamera::LockStatus"; isReadonly: true }
         Signal {
             name: "stateChanged"
-            type: "void"
             Parameter { type: "QCamera::State" }
         }
         Signal {
             name: "captureModeChanged"
-            type: "void"
             Parameter { type: "QCamera::CaptureModes" }
         }
         Signal {
             name: "statusChanged"
-            type: "void"
             Parameter { type: "QCamera::Status" }
         }
-        Signal { name: "locked"; type: "void" }
-        Signal { name: "lockFailed"; type: "void" }
+        Signal { name: "locked" }
+        Signal { name: "lockFailed" }
         Signal {
             name: "lockStatusChanged"
-            type: "void"
             Parameter { type: "QCamera::LockStatus" }
             Parameter { type: "QCamera::LockChangeReason" }
         }
         Signal {
             name: "lockStatusChanged"
-            type: "void"
             Parameter { type: "QCamera::LockType" }
             Parameter { type: "QCamera::LockStatus" }
             Parameter { type: "QCamera::LockChangeReason" }
         }
         Signal {
             name: "error"
-            type: "void"
             Parameter { type: "QCamera::Error" }
         }
         Method {
             name: "setCaptureMode"
-            type: "void"
             Parameter { name: "mode"; type: "QCamera::CaptureModes" }
         }
-        Method { name: "load"; type: "void" }
-        Method { name: "unload"; type: "void" }
-        Method { name: "start"; type: "void" }
-        Method { name: "stop"; type: "void" }
-        Method { name: "searchAndLock"; type: "void" }
-        Method { name: "unlock"; type: "void" }
+        Method { name: "load" }
+        Method { name: "unload" }
+        Method { name: "start" }
+        Method { name: "stop" }
+        Method { name: "searchAndLock" }
+        Method { name: "unlock" }
         Method {
             name: "searchAndLock"
-            type: "void"
             Parameter { name: "locks"; type: "QCamera::LockTypes" }
         }
         Method {
             name: "unlock"
-            type: "void"
             Parameter { name: "locks"; type: "QCamera::LockTypes" }
         }
     }
     Component {
         name: "QDeclarativeAudio"
         prototype: "QObject"
-        exports: ["Audio 5.0", "MediaPlayer 5.0"]
+        exports: ["QtMultimedia/Audio 5.0", "QtMultimedia/MediaPlayer 5.0"]
         Enum {
             name: "Status"
             values: {
@@ -194,12 +187,12 @@ Module {
         Property { name: "autoLoad"; type: "bool" }
         Property { name: "status"; type: "Status"; isReadonly: true }
         Property { name: "duration"; type: "int"; isReadonly: true }
-        Property { name: "position"; type: "int" }
+        Property { name: "position"; type: "int"; isReadonly: true }
         Property { name: "volume"; type: "double" }
         Property { name: "muted"; type: "bool" }
         Property { name: "hasAudio"; type: "bool"; isReadonly: true }
         Property { name: "hasVideo"; type: "bool"; isReadonly: true }
-        Property { name: "bufferProgress"; type: "int"; isReadonly: true }
+        Property { name: "bufferProgress"; type: "double"; isReadonly: true }
         Property { name: "seekable"; type: "bool"; isReadonly: true }
         Property { name: "playbackRate"; type: "double" }
         Property { name: "error"; type: "Error"; isReadonly: true }
@@ -212,45 +205,31 @@ Module {
         }
         Property { name: "mediaObject"; type: "QObject"; isReadonly: true; isPointer: true }
         Property { name: "availability"; type: "Availability"; isReadonly: true }
-        Signal { name: "sourceChanged"; type: "void" }
-        Signal { name: "autoLoadChanged"; type: "void" }
-        Signal { name: "loopCountChanged"; type: "void" }
-        Signal { name: "playbackStateChanged"; type: "void" }
-        Signal { name: "autoPlayChanged"; type: "void" }
-        Signal { name: "paused"; type: "void" }
-        Signal { name: "stopped"; type: "void" }
-        Signal { name: "playing"; type: "void" }
-        Signal { name: "statusChanged"; type: "void" }
-        Signal { name: "durationChanged"; type: "void" }
-        Signal { name: "positionChanged"; type: "void" }
-        Signal { name: "volumeChanged"; type: "void" }
-        Signal { name: "mutedChanged"; type: "void" }
-        Signal { name: "hasAudioChanged"; type: "void" }
-        Signal { name: "hasVideoChanged"; type: "void" }
-        Signal { name: "bufferProgressChanged"; type: "void" }
-        Signal { name: "seekableChanged"; type: "void" }
-        Signal { name: "playbackRateChanged"; type: "void" }
+        Signal { name: "loopCountChanged" }
+        Signal { name: "paused" }
+        Signal { name: "stopped" }
+        Signal { name: "playing" }
         Signal {
             name: "availabilityChanged"
-            type: "void"
             Parameter { name: "availability"; type: "Availability" }
         }
-        Signal { name: "errorChanged"; type: "void" }
         Signal {
             name: "error"
-            type: "void"
             Parameter { name: "error"; type: "QDeclarativeAudio::Error" }
             Parameter { name: "errorString"; type: "string" }
         }
-        Signal { name: "mediaObjectChanged"; type: "void" }
-        Method { name: "play"; type: "void" }
-        Method { name: "pause"; type: "void" }
-        Method { name: "stop"; type: "void" }
+        Method { name: "play" }
+        Method { name: "pause" }
+        Method { name: "stop" }
+        Method {
+            name: "seek"
+            Parameter { name: "position"; type: "int" }
+        }
     }
     Component {
         name: "QDeclarativeCamera"
         prototype: "QObject"
-        exports: ["Camera 5.0"]
+        exports: ["QtMultimedia/Camera 5.0"]
         Enum {
             name: "CaptureMode"
             values: {
@@ -414,118 +393,96 @@ Module {
             isReadonly: true
             isPointer: true
         }
-        Signal { name: "errorChanged"; type: "void" }
+        Signal { name: "errorChanged" }
         Signal {
             name: "error"
-            type: "void"
             Parameter { name: "errorCode"; type: "QDeclarativeCamera::Error" }
             Parameter { name: "errorString"; type: "string" }
         }
-        Signal { name: "captureModeChanged"; type: "void" }
         Signal {
             name: "cameraStateChanged"
-            type: "void"
             Parameter { type: "QDeclarativeCamera::State" }
         }
-        Signal { name: "cameraStatusChanged"; type: "void" }
-        Signal { name: "lockStatusChanged"; type: "void" }
         Signal {
             name: "opticalZoomChanged"
-            type: "void"
             Parameter { type: "double" }
         }
         Signal {
             name: "digitalZoomChanged"
-            type: "void"
             Parameter { type: "double" }
         }
         Signal {
             name: "maximumOpticalZoomChanged"
-            type: "void"
             Parameter { type: "double" }
         }
         Signal {
             name: "maximumDigitalZoomChanged"
-            type: "void"
             Parameter { type: "double" }
         }
-        Signal { name: "mediaObjectChanged"; type: "void" }
         Signal {
             name: "availabilityChanged"
-            type: "void"
             Parameter { name: "availability"; type: "Availability" }
         }
         Method {
             name: "setCaptureMode"
-            type: "void"
             Parameter { name: "mode"; type: "CaptureMode" }
         }
-        Method { name: "start"; type: "void" }
-        Method { name: "stop"; type: "void" }
+        Method { name: "start" }
+        Method { name: "stop" }
         Method {
             name: "setCameraState"
-            type: "void"
             Parameter { name: "state"; type: "State" }
         }
-        Method { name: "searchAndLock"; type: "void" }
-        Method { name: "unlock"; type: "void" }
+        Method { name: "searchAndLock" }
+        Method { name: "unlock" }
         Method {
             name: "setOpticalZoom"
-            type: "void"
             Parameter { type: "double" }
         }
         Method {
             name: "setDigitalZoom"
-            type: "void"
             Parameter { type: "double" }
         }
     }
     Component {
         name: "QDeclarativeCameraCapture"
         prototype: "QObject"
-        exports: ["CameraCapture 5.0"]
+        exports: ["QtMultimedia/CameraCapture 5.0"]
         Property { name: "ready"; type: "bool"; isReadonly: true }
         Property { name: "capturedImagePath"; type: "string"; isReadonly: true }
         Property { name: "resolution"; type: "QSize" }
         Property { name: "errorString"; type: "string"; isReadonly: true }
         Signal {
             name: "readyForCaptureChanged"
-            type: "void"
             Parameter { type: "bool" }
         }
         Signal {
             name: "imageExposed"
-            type: "void"
             Parameter { name: "requestId"; type: "int" }
         }
         Signal {
             name: "imageCaptured"
-            type: "void"
             Parameter { name: "requestId"; type: "int" }
             Parameter { name: "preview"; type: "string" }
         }
         Signal {
             name: "imageMetadataAvailable"
-            type: "void"
             Parameter { name: "requestId"; type: "int" }
             Parameter { name: "key"; type: "string" }
             Parameter { name: "value"; type: "QVariant" }
         }
         Signal {
             name: "imageSaved"
-            type: "void"
             Parameter { name: "requestId"; type: "int" }
             Parameter { name: "path"; type: "string" }
         }
         Signal {
             name: "captureFailed"
-            type: "void"
             Parameter { name: "requestId"; type: "int" }
             Parameter { name: "message"; type: "string" }
         }
         Signal {
             name: "resolutionChanged"
-            type: "void"
             Parameter { type: "QSize" }
         }
         Method { name: "capture"; type: "int" }
@@ -534,15 +491,13 @@ Module {
             type: "int"
             Parameter { name: "location"; type: "string" }
         }
-        Method { name: "cancelCapture"; type: "void" }
+        Method { name: "cancelCapture" }
         Method {
             name: "setResolution"
-            type: "void"
             Parameter { name: "resolution"; type: "QSize" }
         }
         Method {
             name: "setMetadata"
-            type: "void"
             Parameter { name: "key"; type: "string" }
             Parameter { name: "value"; type: "QVariant" }
         }
@@ -550,7 +505,7 @@ Module {
     Component {
         name: "QDeclarativeCameraExposure"
         prototype: "QObject"
-        exports: ["CameraExposure 5.0"]
+        exports: ["QtMultimedia/CameraExposure 5.0"]
         Property { name: "exposureCompensation"; type: "double" }
         Property { name: "iso"; type: "int"; isReadonly: true }
         Property { name: "shutterSpeed"; type: "double"; isReadonly: true }
@@ -563,141 +518,117 @@ Module {
         Property { name: "meteringMode"; type: "QDeclarativeCamera::MeteringMode" }
         Signal {
             name: "isoSensitivityChanged"
-            type: "void"
             Parameter { type: "int" }
         }
         Signal {
             name: "apertureChanged"
-            type: "void"
             Parameter { type: "double" }
         }
         Signal {
             name: "shutterSpeedChanged"
-            type: "void"
             Parameter { type: "double" }
         }
         Signal {
             name: "manualIsoSensitivityChanged"
-            type: "void"
             Parameter { type: "int" }
         }
         Signal {
             name: "manualApertureChanged"
-            type: "void"
             Parameter { type: "double" }
         }
         Signal {
             name: "manualShutterSpeedChanged"
-            type: "void"
             Parameter { type: "double" }
         }
         Signal {
             name: "exposureCompensationChanged"
-            type: "void"
             Parameter { type: "double" }
         }
         Signal {
             name: "exposureModeChanged"
-            type: "void"
             Parameter { type: "QDeclarativeCamera::ExposureMode" }
         }
         Signal {
             name: "meteringModeChanged"
-            type: "void"
             Parameter { type: "QDeclarativeCamera::MeteringMode" }
         }
         Signal {
             name: "spotMeteringPointChanged"
-            type: "void"
             Parameter { type: "QPointF" }
         }
         Method {
             name: "setExposureMode"
-            type: "void"
             Parameter { type: "QDeclarativeCamera::ExposureMode" }
         }
         Method {
             name: "setExposureCompensation"
-            type: "void"
             Parameter { name: "ev"; type: "double" }
         }
         Method {
             name: "setManualAperture"
-            type: "void"
             Parameter { type: "double" }
         }
         Method {
             name: "setManualShutterSpeed"
-            type: "void"
             Parameter { type: "double" }
         }
         Method {
             name: "setManualIsoSensitivity"
-            type: "void"
             Parameter { name: "iso"; type: "int" }
         }
-        Method { name: "setAutoAperture"; type: "void" }
-        Method { name: "setAutoShutterSpeed"; type: "void" }
-        Method { name: "setAutoIsoSensitivity"; type: "void" }
+        Method { name: "setAutoAperture" }
+        Method { name: "setAutoShutterSpeed" }
+        Method { name: "setAutoIsoSensitivity" }
     }
     Component {
         name: "QDeclarativeCameraFlash"
         prototype: "QObject"
-        exports: ["CameraFlash 5.0"]
+        exports: ["QtMultimedia/CameraFlash 5.0"]
         Property { name: "ready"; type: "bool"; isReadonly: true }
         Property { name: "mode"; type: "int" }
         Signal {
             name: "flashReady"
-            type: "void"
             Parameter { name: "status"; type: "bool" }
         }
         Signal {
             name: "flashModeChanged"
-            type: "void"
             Parameter { type: "int" }
         }
         Method {
             name: "setFlashMode"
-            type: "void"
             Parameter { type: "int" }
         }
     }
     Component {
         name: "QDeclarativeCameraFocus"
         prototype: "QObject"
-        exports: ["CameraFocus 5.0"]
+        exports: ["QtMultimedia/CameraFocus 5.0"]
         Property { name: "focusMode"; type: "QDeclarativeCamera::FocusMode" }
         Property { name: "focusPointMode"; type: "QDeclarativeCamera::FocusPointMode" }
         Property { name: "customFocusPoint"; type: "QPointF" }
         Property { name: "focusZones"; type: "QObject"; isReadonly: true; isPointer: true }
         Signal {
             name: "focusModeChanged"
-            type: "void"
             Parameter { type: "QDeclarativeCamera::FocusMode" }
         }
         Signal {
             name: "focusPointModeChanged"
-            type: "void"
             Parameter { type: "QDeclarativeCamera::FocusPointMode" }
         }
         Signal {
             name: "customFocusPointChanged"
-            type: "void"
             Parameter { type: "QPointF" }
         }
         Method {
             name: "setFocusMode"
-            type: "void"
             Parameter { type: "QDeclarativeCamera::FocusMode" }
         }
         Method {
             name: "setFocusPointMode"
-            type: "void"
             Parameter { name: "mode"; type: "QDeclarativeCamera::FocusPointMode" }
         }
         Method {
             name: "setCustomFocusPoint"
-            type: "void"
             Parameter { name: "point"; type: "QPointF" }
         }
         Method {
@@ -714,7 +645,7 @@ Module {
     Component {
         name: "QDeclarativeCameraImageProcessing"
         prototype: "QObject"
-        exports: ["CameraImageProcessing 5.0"]
+        exports: ["QtMultimedia/CameraImageProcessing 5.0"]
         Enum {
             name: "WhiteBalanceMode"
             values: {
@@ -738,69 +669,57 @@ Module {
         Property { name: "denoisingLevel"; type: "double" }
         Signal {
             name: "whiteBalanceModeChanged"
-            type: "void"
             Parameter { type: "QDeclarativeCameraImageProcessing::WhiteBalanceMode" }
         }
         Signal {
             name: "manualWhiteBalanceChanged"
-            type: "void"
             Parameter { type: "double" }
         }
         Signal {
             name: "contrastChanged"
-            type: "void"
             Parameter { type: "double" }
         }
         Signal {
             name: "saturationChanged"
-            type: "void"
             Parameter { type: "double" }
         }
         Signal {
             name: "sharpeningLevelChanged"
-            type: "void"
             Parameter { type: "double" }
         }
         Signal {
             name: "denoisingLevelChanged"
-            type: "void"
             Parameter { type: "double" }
         }
         Method {
             name: "setWhiteBalanceMode"
-            type: "void"
             Parameter { name: "mode"; type: "QDeclarativeCameraImageProcessing::WhiteBalanceMode" }
         }
         Method {
             name: "setManualWhiteBalance"
-            type: "void"
             Parameter { name: "colorTemp"; type: "double" }
         }
         Method {
             name: "setContrast"
-            type: "void"
             Parameter { name: "value"; type: "double" }
         }
         Method {
             name: "setSaturation"
-            type: "void"
             Parameter { name: "value"; type: "double" }
         }
         Method {
             name: "setSharpeningLevel"
-            type: "void"
             Parameter { name: "value"; type: "double" }
         }
         Method {
             name: "setDenoisingLevel"
-            type: "void"
             Parameter { name: "value"; type: "double" }
         }
     }
     Component {
         name: "QDeclarativeCameraRecorder"
         prototype: "QObject"
-        exports: ["CameraRecorder 5.0"]
+        exports: ["QtMultimedia/CameraRecorder 5.0"]
         Enum {
             name: "RecorderState"
             values: {
@@ -859,180 +778,146 @@ Module {
         Property { name: "errorCode"; type: "string"; isReadonly: true }
         Signal {
             name: "recorderStateChanged"
-            type: "void"
             Parameter { name: "state"; type: "QDeclarativeCameraRecorder::RecorderState" }
         }
-        Signal { name: "recorderStatusChanged"; type: "void" }
         Signal {
             name: "durationChanged"
-            type: "void"
             Parameter { name: "duration"; type: "qlonglong" }
         }
         Signal {
             name: "mutedChanged"
-            type: "void"
             Parameter { name: "muted"; type: "bool" }
         }
         Signal {
             name: "outputLocationChanged"
-            type: "void"
             Parameter { name: "location"; type: "string" }
         }
         Signal {
             name: "actualLocationChanged"
-            type: "void"
             Parameter { name: "location"; type: "string" }
         }
         Signal {
             name: "error"
-            type: "void"
             Parameter { name: "errorCode"; type: "QDeclarativeCameraRecorder::Error" }
             Parameter { name: "errorString"; type: "string" }
         }
         Signal {
             name: "metaDataChanged"
-            type: "void"
             Parameter { name: "key"; type: "string" }
             Parameter { name: "value"; type: "QVariant" }
         }
         Signal {
             name: "captureResolutionChanged"
-            type: "void"
             Parameter { type: "QSize" }
         }
         Signal {
             name: "audioCodecChanged"
-            type: "void"
             Parameter { name: "codec"; type: "string" }
         }
         Signal {
             name: "videoCodecChanged"
-            type: "void"
             Parameter { name: "codec"; type: "string" }
         }
         Signal {
             name: "mediaContainerChanged"
-            type: "void"
             Parameter { name: "container"; type: "string" }
         }
         Signal {
             name: "frameRateChanged"
-            type: "void"
             Parameter { name: "arg"; type: "double" }
         }
         Signal {
             name: "videoBitRateChanged"
-            type: "void"
             Parameter { name: "arg"; type: "int" }
         }
         Signal {
             name: "audioBitRateChanged"
-            type: "void"
             Parameter { name: "arg"; type: "int" }
         }
         Signal {
             name: "audioChannelsChanged"
-            type: "void"
             Parameter { name: "arg"; type: "int" }
         }
         Signal {
             name: "audioSampleRateChanged"
-            type: "void"
             Parameter { name: "arg"; type: "int" }
         }
         Signal {
             name: "audioEncodingModeChanged"
-            type: "void"
             Parameter { name: "encodingMode"; type: "EncodingMode" }
         }
         Signal {
             name: "videoEncodingModeChanged"
-            type: "void"
             Parameter { name: "encodingMode"; type: "EncodingMode" }
         }
         Method {
             name: "setOutputLocation"
-            type: "void"
             Parameter { name: "location"; type: "string" }
         }
-        Method { name: "record"; type: "void" }
-        Method { name: "stop"; type: "void" }
+        Method { name: "record" }
+        Method { name: "stop" }
         Method {
             name: "setRecorderState"
-            type: "void"
             Parameter { name: "state"; type: "QDeclarativeCameraRecorder::RecorderState" }
         }
         Method {
             name: "setMuted"
-            type: "void"
             Parameter { name: "muted"; type: "bool" }
         }
         Method {
             name: "setMetadata"
-            type: "void"
             Parameter { name: "key"; type: "string" }
             Parameter { name: "value"; type: "QVariant" }
         }
         Method {
             name: "setCaptureResolution"
-            type: "void"
             Parameter { name: "resolution"; type: "QSize" }
         }
         Method {
             name: "setAudioCodec"
-            type: "void"
             Parameter { name: "codec"; type: "string" }
         }
         Method {
             name: "setVideoCodec"
-            type: "void"
             Parameter { name: "codec"; type: "string" }
         }
         Method {
             name: "setMediaContainer"
-            type: "void"
             Parameter { name: "container"; type: "string" }
         }
         Method {
             name: "setFrameRate"
-            type: "void"
             Parameter { name: "frameRate"; type: "double" }
         }
         Method {
             name: "setVideoBitRate"
-            type: "void"
             Parameter { name: "rate"; type: "int" }
         }
         Method {
             name: "setAudioBitRate"
-            type: "void"
             Parameter { name: "rate"; type: "int" }
         }
         Method {
             name: "setAudioChannels"
-            type: "void"
             Parameter { name: "channels"; type: "int" }
         }
         Method {
             name: "setAudioSampleRate"
-            type: "void"
             Parameter { name: "rate"; type: "int" }
         }
         Method {
             name: "setVideoEncodingMode"
-            type: "void"
             Parameter { name: "encodingMode"; type: "EncodingMode" }
         }
         Method {
             name: "setAudioEncodingMode"
-            type: "void"
             Parameter { name: "encodingMode"; type: "EncodingMode" }
         }
     }
     Component {
         name: "QDeclarativeRadio"
         prototype: "QObject"
-        exports: ["Radio 5.0"]
+        exports: ["QtMultimedia/Radio 5.0"]
         Enum {
             name: "State"
             values: {
@@ -1100,110 +985,92 @@ Module {
         Property { name: "radioData"; type: "QDeclarativeRadioData"; isReadonly: true; isPointer: true }
         Signal {
             name: "stateChanged"
-            type: "void"
             Parameter { name: "state"; type: "QDeclarativeRadio::State" }
         }
         Signal {
             name: "bandChanged"
-            type: "void"
             Parameter { name: "band"; type: "QDeclarativeRadio::Band" }
         }
         Signal {
             name: "frequencyChanged"
-            type: "void"
             Parameter { name: "frequency"; type: "int" }
         }
         Signal {
             name: "stereoStatusChanged"
-            type: "void"
             Parameter { name: "stereo"; type: "bool" }
         }
         Signal {
             name: "searchingChanged"
-            type: "void"
             Parameter { name: "searching"; type: "bool" }
         }
         Signal {
             name: "signalStrengthChanged"
-            type: "void"
             Parameter { name: "signalStrength"; type: "int" }
         }
         Signal {
             name: "volumeChanged"
-            type: "void"
             Parameter { name: "volume"; type: "int" }
         }
         Signal {
             name: "mutedChanged"
-            type: "void"
             Parameter { name: "muted"; type: "bool" }
         }
         Signal {
             name: "stationFound"
-            type: "void"
             Parameter { name: "frequency"; type: "int" }
             Parameter { name: "stationId"; type: "string" }
         }
         Signal {
             name: "antennaConnectedChanged"
-            type: "void"
             Parameter { name: "connectionStatus"; type: "bool" }
         }
         Signal {
             name: "availabilityChanged"
-            type: "void"
             Parameter { name: "availability"; type: "Availability" }
         }
-        Signal { name: "errorChanged"; type: "void" }
+        Signal { name: "errorChanged" }
         Signal {
             name: "error"
-            type: "void"
             Parameter { name: "errorCode"; type: "QDeclarativeRadio::Error" }
         }
         Method {
             name: "setBand"
-            type: "void"
             Parameter { name: "band"; type: "QDeclarativeRadio::Band" }
         }
         Method {
             name: "setFrequency"
-            type: "void"
             Parameter { name: "frequency"; type: "int" }
         }
         Method {
             name: "setStereoMode"
-            type: "void"
             Parameter { name: "stereoMode"; type: "QDeclarativeRadio::StereoMode" }
         }
         Method {
             name: "setVolume"
-            type: "void"
             Parameter { name: "volume"; type: "int" }
         }
         Method {
             name: "setMuted"
-            type: "void"
             Parameter { name: "muted"; type: "bool" }
         }
-        Method { name: "cancelScan"; type: "void" }
-        Method { name: "scanDown"; type: "void" }
-        Method { name: "scanUp"; type: "void" }
-        Method { name: "tuneUp"; type: "void" }
-        Method { name: "tuneDown"; type: "void" }
+        Method { name: "cancelScan" }
+        Method { name: "scanDown" }
+        Method { name: "scanUp" }
+        Method { name: "tuneUp" }
+        Method { name: "tuneDown" }
         Method {
             name: "searchAllStations"
-            type: "void"
             Parameter { name: "searchMode"; type: "QDeclarativeRadio::SearchMode" }
         }
-        Method { name: "searchAllStations"; type: "void" }
-        Method { name: "start"; type: "void" }
-        Method { name: "stop"; type: "void" }
+        Method { name: "searchAllStations" }
+        Method { name: "start" }
+        Method { name: "stop" }
         Method { name: "isAvailable"; type: "bool" }
     }
     Component {
         name: "QDeclarativeRadioData"
         prototype: "QObject"
-        exports: ["RadioData 5.0"]
+        exports: ["QtMultimedia/RadioData 5.0"]
         Enum {
             name: "Error"
             values: {
@@ -1284,48 +1151,39 @@ Module {
         Property { name: "availability"; type: "Availability"; isReadonly: true }
         Signal {
             name: "stationIdChanged"
-            type: "void"
             Parameter { name: "stationId"; type: "string" }
         }
         Signal {
             name: "programTypeChanged"
-            type: "void"
             Parameter { name: "programType"; type: "QDeclarativeRadioData::ProgramType" }
         }
         Signal {
             name: "programTypeNameChanged"
-            type: "void"
             Parameter { name: "programTypeName"; type: "string" }
         }
         Signal {
             name: "stationNameChanged"
-            type: "void"
             Parameter { name: "stationName"; type: "string" }
         }
         Signal {
             name: "radioTextChanged"
-            type: "void"
             Parameter { name: "radioText"; type: "string" }
         }
         Signal {
             name: "alternativeFrequenciesEnabledChanged"
-            type: "void"
             Parameter { name: "enabled"; type: "bool" }
         }
         Signal {
             name: "availabilityChanged"
-            type: "void"
             Parameter { name: "availability"; type: "Availability" }
         }
-        Signal { name: "errorChanged"; type: "void" }
+        Signal { name: "errorChanged" }
         Signal {
             name: "error"
-            type: "void"
             Parameter { name: "errorCode"; type: "QDeclarativeRadioData::Error" }
         }
         Method {
             name: "setAlternativeFrequenciesEnabled"
-            type: "void"
             Parameter { name: "enabled"; type: "bool" }
         }
         Method { name: "isAvailable"; type: "bool" }
@@ -1333,17 +1191,15 @@ Module {
     Component {
         name: "QDeclarativeTorch"
         prototype: "QObject"
-        exports: ["Torch 5.0"]
+        exports: ["QtMultimedia/Torch 5.0"]
         Property { name: "enabled"; type: "bool" }
         Property { name: "power"; type: "int" }
-        Signal { name: "enabledChanged"; type: "void" }
-        Signal { name: "powerChanged"; type: "void" }
     }
     Component {
         name: "QDeclarativeVideoOutput"
         defaultProperty: "data"
         prototype: "QQuickItem"
-        exports: ["VideoOutput 5.0"]
+        exports: ["QtMultimedia/VideoOutput 5.0"]
         Enum {
             name: "FillMode"
             values: {
@@ -1357,15 +1213,10 @@ Module {
         Property { name: "orientation"; type: "int" }
         Property { name: "sourceRect"; type: "QRectF"; isReadonly: true }
         Property { name: "contentRect"; type: "QRectF"; isReadonly: true }
-        Signal { name: "sourceChanged"; type: "void" }
         Signal {
             name: "fillModeChanged"
-            type: "void"
             Parameter { type: "QDeclarativeVideoOutput::FillMode" }
         }
-        Signal { name: "orientationChanged"; type: "void" }
-        Signal { name: "sourceRectChanged"; type: "void" }
-        Signal { name: "contentRectChanged"; type: "void" }
         Method {
             name: "mapPointToItem"
             type: "QPointF"
@@ -1413,36 +1264,31 @@ Module {
         Property { name: "notifyInterval"; type: "int" }
         Signal {
             name: "notifyIntervalChanged"
-            type: "void"
             Parameter { name: "milliSeconds"; type: "int" }
         }
         Signal {
             name: "metaDataAvailableChanged"
-            type: "void"
             Parameter { name: "available"; type: "bool" }
         }
-        Signal { name: "metaDataChanged"; type: "void" }
+        Signal { name: "metaDataChanged" }
         Signal {
             name: "metaDataChanged"
-            type: "void"
             Parameter { name: "key"; type: "string" }
             Parameter { name: "value"; type: "QVariant" }
         }
         Signal {
             name: "availabilityChanged"
-            type: "void"
             Parameter { name: "available"; type: "bool" }
         }
         Signal {
             name: "availabilityChanged"
-            type: "void"
-            Parameter { name: "error"; type: "QMultimedia::AvailabilityStatus" }
+            Parameter { name: "availability"; type: "QMultimedia::AvailabilityStatus" }
         }
     }
     Component {
         name: "QSoundEffect"
         prototype: "QObject"
-        exports: ["SoundEffect 5.0"]
+        exports: ["QtMultimedia/SoundEffect 5.0"]
         Enum {
             name: "Loop"
             values: {
@@ -1466,16 +1312,9 @@ Module {
         Property { name: "playing"; type: "bool"; isReadonly: true }
         Property { name: "status"; type: "Status"; isReadonly: true }
         Property { name: "category"; type: "string" }
-        Signal { name: "sourceChanged"; type: "void" }
-        Signal { name: "loopCountChanged"; type: "void" }
-        Signal { name: "loopsRemainingChanged"; type: "void" }
-        Signal { name: "volumeChanged"; type: "void" }
-        Signal { name: "mutedChanged"; type: "void" }
-        Signal { name: "loadedChanged"; type: "void" }
-        Signal { name: "playingChanged"; type: "void" }
-        Signal { name: "statusChanged"; type: "void" }
-        Signal { name: "categoryChanged"; type: "void" }
-        Method { name: "play"; type: "void" }
-        Method { name: "stop"; type: "void" }
+        Signal { name: "loopCountChanged" }
+        Signal { name: "loadedChanged" }
+        Method { name: "play" }
+        Method { name: "stop" }
     }
 }
diff --git a/src/multimedia/audio/qaudiosystemplugin.cpp b/src/multimedia/audio/qaudiosystemplugin.cpp
index b6e4cdfa8..85fa855b1 100644
--- a/src/multimedia/audio/qaudiosystemplugin.cpp
+++ b/src/multimedia/audio/qaudiosystemplugin.cpp
@@ -95,7 +95,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     Construct a new audio plugin with \a parent.
-    This is invoked automatically by the Q_EXPORT_PLUGIN2() macro.
+    This is invoked automatically by the Q_PLUGIN_METADATA() macro.
 */
 
 QAudioSystemPlugin::QAudioSystemPlugin(QObject* parent) :
diff --git a/src/multimedia/audio/qsound.h b/src/multimedia/audio/qsound.h
index cf799e5df..a4d5327e0 100644
--- a/src/multimedia/audio/qsound.h
+++ b/src/multimedia/audio/qsound.h
@@ -57,7 +57,7 @@ class Q_MULTIMEDIA_EXPORT QSound : public QObject
 public:
     enum Loop
     {
-        Infinite = -1,
+        Infinite = -1
     };
 
     static void play(const QString& filename);
diff --git a/src/multimedia/doc/qtmultimedia.qdocconf b/src/multimedia/doc/qtmultimedia.qdocconf
index a6c9576b7..3873bd25c 100644
--- a/src/multimedia/doc/qtmultimedia.qdocconf
+++ b/src/multimedia/doc/qtmultimedia.qdocconf
@@ -3,7 +3,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 project                 = qtmultimedia
 description             = Qt Multimedia Documentation
 url                     = http://qt-project.org/doc/qtmultimedia
-version                 = 5.0.0
+version                 = 5.0.1
 
 # The following parameters are for creating a qhp file, the qhelpgenerator
 # program can convert the qhp file into a qch file which can be opened in
@@ -30,6 +30,7 @@ qhp.qtmultimedia.subprojects.qmltypes.selectors = class fake:headerfile
 qhp.qtmultimedia.subprojects.qmltypes.sortPages = true
 
 exampledirs += ../../../examples \
+               snippets
 
 headerdirs += ../..
 
diff --git a/src/multimedia/doc/src/snippets/multimedia-snippets/audio.cpp b/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp
index a39f1c7f4..a39f1c7f4 100644
--- a/src/multimedia/doc/src/snippets/multimedia-snippets/audio.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp
diff --git a/src/multimedia/doc/src/snippets/multimedia-snippets/audiorecorder.cpp b/src/multimedia/doc/snippets/multimedia-snippets/audiorecorder.cpp
index e0f136910..e0f136910 100644
--- a/src/multimedia/doc/src/snippets/multimedia-snippets/audiorecorder.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/audiorecorder.cpp
diff --git a/src/multimedia/doc/src/snippets/multimedia-snippets/camera.cpp b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
index 757533be8..757533be8 100644
--- a/src/multimedia/doc/src/snippets/multimedia-snippets/camera.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
diff --git a/src/multimedia/doc/src/snippets/multimedia-snippets/media.cpp b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
index 300ad392b..300ad392b 100644
--- a/src/multimedia/doc/src/snippets/multimedia-snippets/media.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
diff --git a/src/multimedia/doc/src/snippets/multimedia-snippets/multimedia-snippets.pro b/src/multimedia/doc/snippets/multimedia-snippets/multimedia-snippets.pro
index 9571b026e..9571b026e 100644
--- a/src/multimedia/doc/src/snippets/multimedia-snippets/multimedia-snippets.pro
+++ b/src/multimedia/doc/snippets/multimedia-snippets/multimedia-snippets.pro
diff --git a/src/multimedia/doc/src/snippets/multimedia-snippets/qsound.cpp b/src/multimedia/doc/snippets/multimedia-snippets/qsound.cpp
index 1f7dad79f..1f7dad79f 100644
--- a/src/multimedia/doc/src/snippets/multimedia-snippets/qsound.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/qsound.cpp
diff --git a/src/multimedia/doc/src/snippets/multimedia-snippets/soundeffect.qml b/src/multimedia/doc/snippets/multimedia-snippets/soundeffect.qml
index 9b173a46b..9b173a46b 100644
--- a/src/multimedia/doc/src/snippets/multimedia-snippets/soundeffect.qml
+++ b/src/multimedia/doc/snippets/multimedia-snippets/soundeffect.qml
diff --git a/src/multimedia/doc/src/snippets/multimedia-snippets/video.cpp b/src/multimedia/doc/snippets/multimedia-snippets/video.cpp
index 37dca0851..37dca0851 100644
--- a/src/multimedia/doc/src/snippets/multimedia-snippets/video.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/video.cpp
diff --git a/src/multimedia/doc/src/snippets/snippets.pro b/src/multimedia/doc/snippets/snippets.pro
index 31a3a0992..31a3a0992 100644
--- a/src/multimedia/doc/src/snippets/snippets.pro
+++ b/src/multimedia/doc/snippets/snippets.pro
diff --git a/src/multimedia/doc/src/audiooverview.qdoc b/src/multimedia/doc/src/audiooverview.qdoc
index 723afb71b..20c5342e8 100644
--- a/src/multimedia/doc/src/audiooverview.qdoc
+++ b/src/multimedia/doc/src/audiooverview.qdoc
@@ -50,16 +50,16 @@ may have installed.
 
 Here is how you play a local file using C++:
 
-    \snippet doc/src/snippets/multimedia-snippets/media.cpp Local playback
+    \snippet multimedia-snippets/media.cpp Local playback
 
 You can also put files (even remote URLs) into a playlist:
-    \snippet doc/src/snippets/multimedia-snippets/media.cpp Audio playlist
+    \snippet multimedia-snippets/media.cpp Audio playlist
 
 \section2 Recording Audio to a File
 For recording audio to a file, the \l {QAudioRecorder} class allows you
 to compress audio data from an input device and record it.
 
-    \snippet doc/src/snippets/multimedia-snippets/media.cpp Audio recorder
+    \snippet multimedia-snippets/media.cpp Audio recorder
 
 \section2 Low Latency Sound Effects
 
@@ -87,7 +87,7 @@ they may arrive at a slightly different time than the media pipeline
 processes them.
 
 Here's an example of installing a probe during recording:
-    \snippet doc/src/snippets/multimedia-snippets/media.cpp Audio probe
+    \snippet multimedia-snippets/media.cpp Audio probe
 
 \section2 Low Level Audio Playback and Recording
 Qt Multimedia offers classes for raw access to audio input and output
@@ -123,7 +123,7 @@ or from a QIODevice instances.
 
 Here's an example of decoding a local file:
 
-    \snippet doc/src/snippets/multimedia-snippets/audio.cpp Local audio decoding
+    \snippet multimedia-snippets/audio.cpp Local audio decoding
 
 Note:  This API is preliminary at this time - the API may change or be
 removed before the final 5.0 release.
diff --git a/src/multimedia/doc/src/cameraoverview.qdoc b/src/multimedia/doc/src/cameraoverview.qdoc
index f6bf4f533..40c82a69a 100644
--- a/src/multimedia/doc/src/cameraoverview.qdoc
+++ b/src/multimedia/doc/src/cameraoverview.qdoc
@@ -118,14 +118,14 @@ In C++, your choice depends on whether you are using widgets, or QGraphicsView.
 The \l QVideoWidget class is used in the widgets case, and \l QGraphicsVideoItem
 is useful for QGraphicsView.
 
-    \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera overview viewfinder
+    \snippet multimedia-snippets/camera.cpp Camera overview viewfinder
 
 For advanced usage (like processing viewfinder frames as they come, to detect
 objects or patterns), you can also derive from \l QAbstractVideoSurface and
 set that as the viewfinder for the QCamera object.  In this case you will
 need to render the viewfinder image yourself.
 
-    \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera overview surface
+    \snippet multimedia-snippets/camera.cpp Camera overview surface
 
 \section2 Still Images
 
@@ -136,7 +136,7 @@ that things are in focus and the settings are not different from the
 viewfinder while the image capture occurs, capture the image, and
 finally unlock the camera ready for the next photo.
 
-    \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera overview capture
+    \snippet multimedia-snippets/camera.cpp Camera overview capture
 
 \section2 Movies
 
@@ -146,7 +146,7 @@ video requires the use of a \l QMediaRecorder object.
 To record video we need to create a camera object as before but this time as
 well as creating a viewfinder, we will also initialize a media recorder object.
 
-    \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera overview movie
+    \snippet multimedia-snippets/camera.cpp Camera overview movie
 
 Signals from the \e mediaRecorder can be connected to slots to react to
 changes in the state of the recorder or error events. Recording itself
diff --git a/examples/video/doc/src/video-qml-paint-rate.qdocinc b/src/multimedia/doc/src/examples/video-qml-paint-rate.qdocinc
index 84098e241..860f14270 100644
--- a/examples/video/doc/src/video-qml-paint-rate.qdocinc
+++ b/src/multimedia/doc/src/examples/video-qml-paint-rate.qdocinc
@@ -2,7 +2,7 @@ The QML painting rate is calculated by the FrequencyMonitor class, which
 turns a stream of events (received via the notify() slot), into an
 instantaneous and an averaged frequency:
 
-\quotefromfile video/snippets/frequencymonitor/frequencymonitor.h
+\quotefromfile multimedia/video/snippets/frequencymonitor/frequencymonitor.h
 \skipto class FrequencyMonitor : public QObject
 \printuntil Q_OBJECT
 \skipto Q_PROPERTY(qreal instantaneousFrequency
@@ -19,13 +19,13 @@ instantaneous and an averaged frequency:
 
 The FrequencyMonitor class is exposed to QML like this
 
-\quotefromfile video/snippets/frequencymonitor/frequencymonitordeclarative.cpp
+\quotefromfile multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp
 \skipto FrequencyMonitor::qmlRegisterType
 \printuntil }
 
 and its data is displayed by defining a QML item called FrequencyItem, like this:
 
-\quotefromfile video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml
+\quotefromfile multimedia/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml
 \skipto import FrequencyMonitor
 \printuntil id: root
 \dots
diff --git a/examples/video/doc/images/video-qml-paint-rate.png b/src/multimedia/doc/src/images/video-qml-paint-rate.png
index 1519ff64e..1519ff64e 100644
--- a/examples/video/doc/images/video-qml-paint-rate.png
+++ b/src/multimedia/doc/src/images/video-qml-paint-rate.png
diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc
index b5d967f61..5afa9f6a1 100644
--- a/src/multimedia/doc/src/multimedia.qdoc
+++ b/src/multimedia/doc/src/multimedia.qdoc
@@ -81,51 +81,54 @@ For some quick recipes for specific tasks, look at the overviews above and consu
     \row
         \li Playing a sound effect
         \li
-        \li \l SoundEffect
+        \li
         \li QSoundEffect
     \row
         \li Playing low latency audio
-        \li \l{audiooutput}, \l{spectrum}
+        \li \l{multimedia/audiooutput}{audioinput}, \l{multimedia/spectrum}{spectrum}
         \li
         \li QAudioOutput
     \row
         \li Playing encoded audio (MP3, AAC etc)
-        \li \l{player}
+        \li \l{multimediawidgets/player}{player}
         \li \l Audio, \l {MediaPlayer}
         \li QMediaPlayer
     \row
         \li Accessing raw audio input data
-        \li \l{spectrum}, \l audioinput
+        \li \l{multimedia/spectrum}{spectrum}, \l {multimedia/audioinput}{audioinput}
         \li
         \li QAudioInput
     \row
         \li Recording encoded audio data
-        \li \l audiorecorder
+        \li \l {multimedia/audiorecorder}{audiorecorder}
         \li
         \li QAudioRecorder
     \row
         \li Discovering raw audio devices
-        \li \l audiodevices
+        \li \l {multimedia/audiodevices}{audiodevices}
         \li
         \li QAudioDeviceInfo
     \row
         \li Video Playback
-        \li \l {player}, \l {video/qmlvideo}{qmlvideo}, \l{video/qmlvideofx}{qmlvideofx}
+        \li \l {multimediawidgets/player}{player},
+            \l {multimedia/video/qmlvideo}{qmlvideo},
+            \l{multimedia/video/qmlvideofx}{qmlvideofx}
         \li \l MediaPlayer, \l VideoOutput, \l Video
         \li QMediaPlayer, QVideoWidget, QGraphicsVideoItem
     \row
         \li Video Processing
-        \li \l {video/qmlvideofx}{qmlvideofx}
+        \li \l {multimedia/video/qmlvideofx}{qmlvideofx}
         \li \l {MediaPlayer}, \l VideoOutput
         \li QMediaPlayer, QAbstractVideoSurface, QVideoFrame
     \row
         \li Listening to the radio
-        \li \l declarative-radio
+        \li \l {multimedia/declarative-radio}{declarative-radio}
         \li \l Radio, \l RadioData
         \li QRadioTuner, QRadioData
     \row
         \li Accessing camera viewfinder
-        \li \l {Camera Example}{camera}, \l declarative-camera
+        \li \l {Camera Example}{camera},
+            \l {multimediawidgets/declarative-camera}{declarative-camera}
         \li \l Camera, \l VideoOutput
         \li QCamera, QVideoWidget, QGraphicsVideoItem
     \row
@@ -135,12 +138,12 @@ For some quick recipes for specific tasks, look at the overviews above and consu
         \li QCamera, QAbstractVideoSurface, QVideoFrame
     \row
         \li Capturing photos
-        \li \l {Camera Example}{camera}, \l declarative-camera
+        \li \l {Camera Example}{camera}, \l {multimediawidgets/declarative-camera}{declarative-camera}
         \li \l Camera
         \li QCamera, QCameraImageCapture
     \row
         \li Capturing movies
-        \li \l {Camera Example}{camera}, \l declarative-camera
+        \li \l {Camera Example}{camera}, \l {multimediawidgets/declarative-camera}{declarative-camera}
         \li \l Camera
         \li QCamera, QMediaRecorder
     \row
diff --git a/src/multimedia/doc/src/qtmultimedia-examples.qdoc b/src/multimedia/doc/src/qtmultimedia-examples.qdoc
new file mode 100644
index 000000000..4427e16f3
--- /dev/null
+++ b/src/multimedia/doc/src/qtmultimedia-examples.qdoc
@@ -0,0 +1,37 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \group multimedia_examples
+    \ingroup all-examples
+    \title Qt Multimedia Examples
+    \brief Demonstrates the multimedia functionality provided by Qt.
+
+    The \l{Qt Multimedia} module provides low-level audio support on Linux,
+    Windows and Mac OS X. It also provides audio plugin API to allow developers
+    implement their own audio support for custom devices and platforms.
+*/
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
 */
diff --git a/src/multimedia/doc/src/videooverview.qdoc b/src/multimedia/doc/src/videooverview.qdoc
index f0d8de05b..45ea87f09 100644
--- a/src/multimedia/doc/src/videooverview.qdoc
+++ b/src/multimedia/doc/src/videooverview.qdoc
@@ -47,10 +47,10 @@ You can use the \l QMediaPlayer class to decode a video file, and display
 it using \l QVideoWidget, \l QGraphicsVideoItem, or a custom class.
 
 Here's an example of using QVideoWidget:
-    \snippet doc/src/snippets/multimedia-snippets/video.cpp Video widget
+    \snippet multimedia-snippets/video.cpp Video widget
 
 And an example with QGraphicsVideoItem:
-    \snippet doc/src/snippets/multimedia-snippets/video.cpp Video graphics item
+    \snippet multimedia-snippets/video.cpp Video graphics item
 
 \section2 Playing Video in QML
 
@@ -77,12 +77,12 @@ processing, while deriving a class from \l QAbstractVideoSurface
 allows you to receive these frames from \l QMediaPlayer and
 \l QCamera.
 
-\snippet doc/src/snippets/multimedia-snippets/video.cpp Derived Surface
+\snippet multimedia-snippets/video.cpp Derived Surface
 
 and with an instance of this surface, \c myVideoSurface, you can set
 the surface as the \l {QMediaPlayer::setVideoOutput()}{video output} for QMediaPlayer.
 
-\snippet doc/src/snippets/multimedia-snippets/video.cpp Setting surface in player
+\snippet multimedia-snippets/video.cpp Setting surface in player
 
 Several of the built-in Qt classes offer this functionality
 as well, so if you decode video in your application, you can present
@@ -97,7 +97,7 @@ The following snippet shows a class that has a writable \c videoSurface property
 and receives frames through a public slot \c onNewVideoContentReceived(). These
 frames are then presented on the surface set in \c setVideoSurface().
 
-\snippet doc/src/snippets/multimedia-snippets/video.cpp Video producer
+\snippet multimedia-snippets/video.cpp Video producer
 
 \section2 Recording Video
 You can use the \l QMediaRecorder class in conjunction with other
@@ -116,7 +116,7 @@ the video frames using this class, and they may arrive at a slightly
 different time than they are being rendered.
 
 Here's an example of installing a video probe while recording the camera:
-    \snippet doc/src/snippets/multimedia-snippets/media.cpp Video probe
+    \snippet multimedia-snippets/media.cpp Video probe
 
 \section1 Examples
 
diff --git a/src/multimedia/qmediacontrol.cpp b/src/multimedia/qmediacontrol.cpp
index 5933ce430..13a66813c 100644
--- a/src/multimedia/qmediacontrol.cpp
+++ b/src/multimedia/qmediacontrol.cpp
@@ -68,14 +68,14 @@ QT_BEGIN_NAMESPACE
     the \l {QMediaService::requestControl()} member of QMediaService.  If the
     service doesn't implement a control it will instead return a null pointer.
 
-    \snippet doc/src/snippets/multimedia-snippets/media.cpp Request control
+    \snippet multimedia-snippets/media.cpp Request control
 
     Alternatively if the IId of the control has been declared using
     Q_MEDIA_DECLARE_CONTROL the template version of
     QMediaService::requestControl() can be used to request the service without
     explicitly passing the IId or using qobject_cast().
 
-    \snippet doc/src/snippets/multimedia-snippets/media.cpp Request control templated
+    \snippet multimedia-snippets/media.cpp Request control templated
 
     Most application code will not interface directly with a media service's
     controls, instead the QMediaObject which owns the service acts as an
@@ -95,7 +95,7 @@ QT_BEGIN_NAMESPACE
     be requested from QMediaService::requestControl() without explicitly
     passing the IId.
 
-    \snippet doc/src/snippets/multimedia-snippets/media.cpp Request control templated
+    \snippet multimedia-snippets/media.cpp Request control templated
 
     \sa QMediaService::requestControl()
 */
diff --git a/src/multimedia/qmediaobject.cpp b/src/multimedia/qmediaobject.cpp
index d1cafbf66..86f6a5dfc 100644
--- a/src/multimedia/qmediaobject.cpp
+++ b/src/multimedia/qmediaobject.cpp
@@ -423,7 +423,7 @@ void QMediaObject::setupControls()
 /*!
     \fn QMediaObject::availabilityChanged(QMultimedia::AvailabilityStatus availability)
 
-    Signal emitted when the availability of the service has changed to \a availabilty
+    Signal emitted when the availability of the service has changed to \a availability.
 */
 
 
diff --git a/src/multimedia/qmediaservice.cpp b/src/multimedia/qmediaservice.cpp
index c21e1df5a..6e68e9d0a 100644
--- a/src/multimedia/qmediaservice.cpp
+++ b/src/multimedia/qmediaservice.cpp
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
     A pointer to media service's QMediaControl implementation can be obtained
     by passing the control's interface name to the requestControl() function.
 
-    \snippet doc/src/snippets/multimedia-snippets/media.cpp Request control
+    \snippet multimedia-snippets/media.cpp Request control
 
     Media objects can use services loaded dynamically from plug-ins or
     implemented statically within an applications.  Plug-in based services
diff --git a/src/multimedia/qmultimedia.cpp b/src/multimedia/qmultimedia.cpp
index 15eda0b56..b9e09f7d7 100644
--- a/src/multimedia/qmultimedia.cpp
+++ b/src/multimedia/qmultimedia.cpp
@@ -98,10 +98,10 @@ namespace
 
     Enumerates Service status errors.
 
-    \value NoError The service is operating correctly.
-    \value ServiceMissingError There is no service available to provide the requested functionality.
+    \value Available The service is operating correctly.
+    \value ServiceMissing There is no service available to provide the requested functionality.
     \value ResourceError The service could not allocate resources required to function correctly.
-    \value BusyError The service must wait for access to necessary resources.
+    \value Busy The service must wait for access to necessary resources.
 */
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/radio/qradiodata.cpp b/src/multimedia/radio/qradiodata.cpp
index f6d380826..569224896 100644
--- a/src/multimedia/radio/qradiodata.cpp
+++ b/src/multimedia/radio/qradiodata.cpp
@@ -78,7 +78,7 @@ namespace
     You can get a QRadioData instance fromt the \l{QRadioTuner::radioData()}{radioData}
     property from a QRadioTuner instance.
 
-    \snippet doc/src/snippets/multimedia-snippets/media.cpp Radio data setup
+    \snippet multimedia-snippets/media.cpp Radio data setup
 
     Alternatively, you can pass an instance of QRadioTuner to the constructor to QRadioData.
 
diff --git a/src/multimedia/radio/qradiotuner.cpp b/src/multimedia/radio/qradiotuner.cpp
index d9d9cb6bf..a0cbb5857 100644
--- a/src/multimedia/radio/qradiotuner.cpp
+++ b/src/multimedia/radio/qradiotuner.cpp
@@ -79,7 +79,7 @@ namespace
 
     You can control the systems analog radio device using this interface, for example:
 
-    \snippet doc/src/snippets/multimedia-snippets/media.cpp Radio tuner
+    \snippet multimedia-snippets/media.cpp Radio tuner
 
     The radio object will emit signals for any changes in state such as:
     bandChanged(), frequencyChanged(), stereoStatusChanged(), searchingChanged(),
diff --git a/src/multimedia/recording/qaudiorecorder.cpp b/src/multimedia/recording/qaudiorecorder.cpp
index 25225e5ed..71fd219c9 100644
--- a/src/multimedia/recording/qaudiorecorder.cpp
+++ b/src/multimedia/recording/qaudiorecorder.cpp
@@ -66,11 +66,11 @@ QT_BEGIN_NAMESPACE
     The QAudioRecorder class is a high level media recording class and contains
     the same functionality as \l QMediaRecorder.
 
-    \snippet doc/src/snippets/multimedia-snippets/media.cpp Audio recorder
+    \snippet multimedia-snippets/media.cpp Audio recorder
 
     In addition QAudioRecorder provides functionality for selecting the audio input.
 
-    \snippet doc/src/snippets/multimedia-snippets/media.cpp Audio recorder inputs
+    \snippet multimedia-snippets/media.cpp Audio recorder inputs
 
     The \l {audiorecorder}{Audio Recorder} example shows how to use this class
     in more detail.
diff --git a/src/multimedia/recording/qmediaencodersettings.cpp b/src/multimedia/recording/qmediaencodersettings.cpp
index 8f8287f4c..1c0f53231 100644
--- a/src/multimedia/recording/qmediaencodersettings.cpp
+++ b/src/multimedia/recording/qmediaencodersettings.cpp
@@ -111,7 +111,7 @@ private:
     and then passing it to a QMediaRecorder instance using the
     QMediaRecorder::setEncodingSettings() function.
 
-    \snippet doc/src/snippets/multimedia-snippets/media.cpp Audio encoder settings
+    \snippet multimedia-snippets/media.cpp Audio encoder settings
 
     \sa QMediaRecorder, QAudioEncoderSettingsControl
 */
@@ -425,7 +425,7 @@ private:
     and then passing it to a QMediaRecorder instance using the
     QMediaRecorder::setEncodingSettings() function.
 
-    \snippet doc/src/snippets/multimedia-snippets/media.cpp Video encoder settings
+    \snippet multimedia-snippets/media.cpp Video encoder settings
 
     \sa QMediaRecorder, QVideoEncoderSettingsControl
 */
@@ -751,7 +751,7 @@ private:
     properties and then passing it to a QCameraImageCapture instance using the
     QCameraImageCapture::setImageSettings() function.
 
-    \snippet doc/src/snippets/multimedia-snippets/media.cpp Image encoder settings
+    \snippet multimedia-snippets/media.cpp Image encoder settings
 
     \sa QImageEncoderControl
 */
diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp
index dd303a12b..79d70e442 100644
--- a/src/multimedia/recording/qmediarecorder.cpp
+++ b/src/multimedia/recording/qmediarecorder.cpp
@@ -75,7 +75,7 @@ QT_BEGIN_NAMESPACE
     intended to be used alone but for accessing the media recording functions
     of other media objects, like QRadioTuner, or QCamera.
 
-    \snippet doc/src/snippets/multimedia-snippets/media.cpp Media recorder
+    \snippet multimedia-snippets/media.cpp Media recorder
 
     \sa QAudioRecorder
 */
diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro
index 502c4ccda..d0638dd21 100644
--- a/src/multimediawidgets/multimediawidgets.pro
+++ b/src/multimediawidgets/multimediawidgets.pro
@@ -7,8 +7,6 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) {
    DEFINES += QT_NO_OPENGL
 }
 
-CONFIG += no_private_qt_headers_warning
-
 load(qt_module)
 
 PRIVATE_HEADERS += \
diff --git a/src/plugins/audiocapture/audiocapture.pro b/src/plugins/audiocapture/audiocapture.pro
index f58f43eab..833e4b5fc 100644
--- a/src/plugins/audiocapture/audiocapture.pro
+++ b/src/plugins/audiocapture/audiocapture.pro
@@ -2,6 +2,7 @@ TARGET = qtmedia_audioengine
 QT += multimedia-private
 
 PLUGIN_TYPE=mediaservice
+PLUGIN_CLASS_NAME = AudioCaptureServicePlugin
 load(qt_plugin)
 
 HEADERS += audioencodercontrol.h \
diff --git a/src/plugins/avfoundation/camera/camera.pro b/src/plugins/avfoundation/camera/camera.pro
index 2eced1819..3c7511715 100644
--- a/src/plugins/avfoundation/camera/camera.pro
+++ b/src/plugins/avfoundation/camera/camera.pro
@@ -5,6 +5,7 @@ TARGET = qavfcamera
 QT += multimedia-private network
 
 PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = AVFServicePlugin
 load(qt_plugin)
 
 LIBS += -framework AppKit -framework AudioUnit \
diff --git a/src/plugins/avfoundation/mediaplayer/avfvideowidget.mm b/src/plugins/avfoundation/mediaplayer/avfvideowidget.mm
index 307539851..a6a2f4236 100644
--- a/src/plugins/avfoundation/mediaplayer/avfvideowidget.mm
+++ b/src/plugins/avfoundation/mediaplayer/avfvideowidget.mm
@@ -103,11 +103,11 @@ void AVFVideoWidget::paintGL()
         return;
 
     QRect targetRect = displayRect();
-    int x1 = targetRect.left();
-    int x2 = targetRect.right();
-    int y1 = targetRect.bottom();
-    int y2 = targetRect.top();
-    int zValue = 0;
+    GLfloat x1 = targetRect.left();
+    GLfloat x2 = targetRect.right();
+    GLfloat y1 = targetRect.bottom();
+    GLfloat y2 = targetRect.top();
+    GLfloat zValue = 0;
 
     const GLfloat textureCoordinates[] = {
         0, 0,
diff --git a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
index 45a30acf2..d1957d5f3 100644
--- a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
+++ b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
@@ -8,6 +8,7 @@ TARGET = qavfmediaplayer
 QT += multimedia-private network
 
 PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = AVFMediaPlayerServicePlugin
 load(qt_plugin)
 
 LIBS += -framework AVFoundation -framework CoreMedia
diff --git a/src/plugins/blackberry/mediaservice/mediaservice.pro b/src/plugins/blackberry/mediaservice/mediaservice.pro
index 9c658a57b..ffaed4816 100644
--- a/src/plugins/blackberry/mediaservice/mediaservice.pro
+++ b/src/plugins/blackberry/mediaservice/mediaservice.pro
@@ -1,8 +1,8 @@
 TARGET = qtmedia_blackberry
 QT += multimedia-private gui-private
-CONFIG += no_private_qt_headers_warning
 
 PLUGIN_TYPE=mediaservice
+PLUGIN_CLASS_NAME = BbServicePlugin
 load(qt_plugin)
 
 LIBS += -lmmrndclient -lstrm -lscreen
diff --git a/src/plugins/directshow/camera/camera.pri b/src/plugins/directshow/camera/camera.pri
index b576a852f..91111bee0 100644
--- a/src/plugins/directshow/camera/camera.pri
+++ b/src/plugins/directshow/camera/camera.pri
@@ -28,5 +28,5 @@ SOURCES += \
     SOURCES += $$PWD/dsvideowidgetcontrol.cpp
 }
 
-*-msvc*:INCLUDEPATH += $(DXSDK_DIR)/include
+*-msvc*:INCLUDEPATH += $$(DXSDK_DIR)/include
 LIBS += -lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32
diff --git a/src/plugins/directshow/camera/dscameraservice.cpp b/src/plugins/directshow/camera/dscameraservice.cpp
index 6d2974160..fcbd1ef58 100644
--- a/src/plugins/directshow/camera/dscameraservice.cpp
+++ b/src/plugins/directshow/camera/dscameraservice.cpp
@@ -44,7 +44,7 @@
 
 #if defined(HAVE_WIDGETS)
 #include <QtWidgets/qwidget.h>
-#include <QVideoWidgetControl.h>
+#include <QVideoWidgetControl>
 #endif
 
 #include "dscameraservice.h"
diff --git a/src/plugins/directshow/camera/dsvideodevicecontrol.cpp b/src/plugins/directshow/camera/dsvideodevicecontrol.cpp
index 46865690f..7c33d130d 100644
--- a/src/plugins/directshow/camera/dsvideodevicecontrol.cpp
+++ b/src/plugins/directshow/camera/dsvideodevicecontrol.cpp
@@ -49,7 +49,7 @@
 #include <dshow.h>
 #include <objbase.h>
 #include <initguid.h>
-#include <Ocidl.h>
+#include <ocidl.h>
 #include <string.h>
 
 extern const CLSID CLSID_VideoInputDeviceCategory;
diff --git a/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp b/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp
index 843719b8e..d7a913d7b 100644
--- a/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp
+++ b/src/plugins/directshow/camera/dsvideowidgetcontrol.cpp
@@ -42,7 +42,7 @@
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qtimer.h>
 
-#include "DSVideoWidgetControl.h"
+#include "dsvideowidgetcontrol.h"
 #include "dscamerasession.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/directshow/camera/dsvideowidgetcontrol.h b/src/plugins/directshow/camera/dsvideowidgetcontrol.h
index ac390c82b..9249c3178 100644
--- a/src/plugins/directshow/camera/dsvideowidgetcontrol.h
+++ b/src/plugins/directshow/camera/dsvideowidgetcontrol.h
@@ -49,7 +49,7 @@
 #include <QtMultimedia/qvideosurfaceformat.h>
 
 #include <qvideowidgetcontrol.h>
-#include "DsCameraControl.h"
+#include "dscameracontrol.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro
index 97f28342e..496769890 100644
--- a/src/plugins/directshow/directshow.pro
+++ b/src/plugins/directshow/directshow.pro
@@ -1,6 +1,7 @@
 TARGET = dsengine
 
 PLUGIN_TYPE=mediaservice
+PLUGIN_CLASS_NAME = DSServicePlugin
 load(qt_plugin)
 
 QT += multimedia
diff --git a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro
index e559f7e02..8cd1d587e 100644
--- a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro
+++ b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro
@@ -1,6 +1,7 @@
 TARGET = gstaudiodecoder
 
 PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = QGstreamerAudioDecoderServicePlugin
 load(qt_plugin)
 
 include(../common.pri)
diff --git a/src/plugins/gstreamer/camerabin/camerabin.pro b/src/plugins/gstreamer/camerabin/camerabin.pro
index 5a2dde161..7f84fe54d 100644
--- a/src/plugins/gstreamer/camerabin/camerabin.pro
+++ b/src/plugins/gstreamer/camerabin/camerabin.pro
@@ -3,6 +3,7 @@ TARGET = gstcamerabin
 QT += multimedia-private
 
 PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = CameraBinServicePlugin
 load(qt_plugin)
 
 include(../common.pri)
diff --git a/src/plugins/gstreamer/mediacapture/mediacapture.pro b/src/plugins/gstreamer/mediacapture/mediacapture.pro
index 9c6cc3c5a..e8d039f8d 100644
--- a/src/plugins/gstreamer/mediacapture/mediacapture.pro
+++ b/src/plugins/gstreamer/mediacapture/mediacapture.pro
@@ -1,6 +1,7 @@
 TARGET = gstmediacapture
 
 PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = QGstreamerCaptureServicePlugin
 load(qt_plugin)
 
 include(../common.pri)
diff --git a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro
index 70e5c8d0b..2ca9377db 100644
--- a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro
+++ b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro
@@ -1,6 +1,7 @@
 TARGET = gstmediaplayer
 
 PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = QGstreamerPlayerServicePlugin
 load(qt_plugin)
 
 include(../common.pri)
diff --git a/src/plugins/m3u/m3u.pro b/src/plugins/m3u/m3u.pro
index 875e815c1..3897e2de8 100644
--- a/src/plugins/m3u/m3u.pro
+++ b/src/plugins/m3u/m3u.pro
@@ -2,6 +2,7 @@ TARGET = qtmultimedia_m3u
 QT += multimedia-private
 
 PLUGIN_TYPE=playlistformats
+PLUGIN_CLASS_NAME = QM3uPlaylistPlugin
 load(qt_plugin)
 
 HEADERS += qm3uhandler.h
diff --git a/src/plugins/pulseaudio/pulseaudio.pro b/src/plugins/pulseaudio/pulseaudio.pro
index ac049dc21..e8ab9317c 100644
--- a/src/plugins/pulseaudio/pulseaudio.pro
+++ b/src/plugins/pulseaudio/pulseaudio.pro
@@ -2,6 +2,7 @@ TARGET = qtmedia_pulse
 QT += multimedia-private
 
 PLUGIN_TYPE = audio
+PLUGIN_CLASS_NAME = QPulseAudioPlugin
 load(qt_plugin)
 
 CONFIG += link_pkgconfig
diff --git a/src/plugins/qt7/qt7.pro b/src/plugins/qt7/qt7.pro
index edc3ddde6..ae87bd44a 100644
--- a/src/plugins/qt7/qt7.pro
+++ b/src/plugins/qt7/qt7.pro
@@ -8,6 +8,7 @@ QT += multimedia-private network
 }
 
 PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = QT7ServicePlugin
 load(qt_plugin)
 
 !simulator {
diff --git a/src/plugins/qt7/qt7movierenderer.mm b/src/plugins/qt7/qt7movierenderer.mm
index f1508294a..a55c44b18 100644
--- a/src/plugins/qt7/qt7movierenderer.mm
+++ b/src/plugins/qt7/qt7movierenderer.mm
@@ -55,7 +55,7 @@
 #include <qabstractvideosurface.h>
 #include <qvideosurfaceformat.h>
 
-#include <QtOpenGl/QGLContext>
+#include <QtOpenGL/QGLContext>
 
 QT_USE_NAMESPACE
 
diff --git a/src/plugins/qt7/qt7movieviewoutput.mm b/src/plugins/qt7/qt7movieviewoutput.mm
index 9600872b3..a65fd24ef 100644
--- a/src/plugins/qt7/qt7movieviewoutput.mm
+++ b/src/plugins/qt7/qt7movieviewoutput.mm
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#import <QTKit/QTkit.h>
+#import <QTKit/QTKit.h>
 
 #include "qt7backend.h"
 
diff --git a/src/plugins/v4l/v4l.pro b/src/plugins/v4l/v4l.pro
index 92c561947..c5e953538 100644
--- a/src/plugins/v4l/v4l.pro
+++ b/src/plugins/v4l/v4l.pro
@@ -2,6 +2,7 @@ TARGET = qtmedia_v4lengine
 QT += multimedia-private
 
 PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = V4LServicePlugin
 load(qt_plugin)
 
 HEADERS += v4lserviceplugin.h
diff --git a/src/plugins/wmf/player/evr9videowindowcontrol.cpp b/src/plugins/wmf/player/evr9videowindowcontrol.cpp
index 0a50114dd..7f1c71332 100644
--- a/src/plugins/wmf/player/evr9videowindowcontrol.cpp
+++ b/src/plugins/wmf/player/evr9videowindowcontrol.cpp
@@ -57,27 +57,17 @@ Evr9VideoWindowControl::Evr9VideoWindowControl(QObject *parent)
     , m_currentActivate(0)
     , m_evrSink(0)
     , m_displayControl(0)
+    , m_processor(0)
 {
-    if (FAILED(MFCreateVideoRendererActivate(0, &m_currentActivate))) {
-        qWarning() << "Failed to create evr video renderer activate!";
-        return;
-    }
-    if (FAILED(m_currentActivate->ActivateObject(IID_IMFMediaSink, (LPVOID*)(&m_evrSink)))) {
-        qWarning() << "Failed to activate evr media sink!";
-        return;
-    }
-    if (FAILED(MFGetService(m_evrSink, MR_VIDEO_RENDER_SERVICE, IID_PPV_ARGS(&m_displayControl)))) {
-        qWarning() << "Failed to get display control from evr media sink!";
-        return;
-    }
-    if (FAILED(MFGetService(m_evrSink,  MR_VIDEO_MIXER_SERVICE, IID_PPV_ARGS(&m_processor)))) {
-        qWarning() << "Failed to get video processor from evr media sink!";
-        return;
-    }
 }
 
 Evr9VideoWindowControl::~Evr9VideoWindowControl()
 {
+   clear();
+}
+
+void Evr9VideoWindowControl::clear()
+{
     if (m_processor)
         m_processor->Release();
     if (m_displayControl)
@@ -88,8 +78,12 @@ Evr9VideoWindowControl::~Evr9VideoWindowControl()
         m_currentActivate->ShutdownObject();
         m_currentActivate->Release();
     }
-}
 
+    m_processor = NULL;
+    m_displayControl = NULL;
+    m_evrSink = NULL;
+    m_currentActivate = NULL;
+}
 
 WId Evr9VideoWindowControl::winId() const
 {
@@ -307,8 +301,32 @@ void Evr9VideoWindowControl::setSaturation(int saturation)
     emit saturationChanged(saturation);
 }
 
-IMFActivate* Evr9VideoWindowControl::currentActivate() const
+IMFActivate* Evr9VideoWindowControl::createActivate()
 {
+    clear();
+
+    if (FAILED(MFCreateVideoRendererActivate(0, &m_currentActivate))) {
+        qWarning() << "Failed to create evr video renderer activate!";
+        return 0;
+    }
+    if (FAILED(m_currentActivate->ActivateObject(IID_IMFMediaSink, (LPVOID*)(&m_evrSink)))) {
+        qWarning() << "Failed to activate evr media sink!";
+        return 0;
+    }
+    if (FAILED(MFGetService(m_evrSink, MR_VIDEO_RENDER_SERVICE, IID_PPV_ARGS(&m_displayControl)))) {
+        qWarning() << "Failed to get display control from evr media sink!";
+        return 0;
+    }
+    if (FAILED(MFGetService(m_evrSink,  MR_VIDEO_MIXER_SERVICE, IID_PPV_ARGS(&m_processor)))) {
+        qWarning() << "Failed to get video processor from evr media sink!";
+        return 0;
+    }
+
+    setWinId(m_windowId);
+    setDisplayRect(m_displayRect);
+    setAspectRatioMode(m_aspectRatioMode);
+    m_dirtyValues = DXVA2_ProcAmp_Brightness | DXVA2_ProcAmp_Contrast | DXVA2_ProcAmp_Hue | DXVA2_ProcAmp_Saturation;
+
     return m_currentActivate;
 }
 
diff --git a/src/plugins/wmf/player/evr9videowindowcontrol.h b/src/plugins/wmf/player/evr9videowindowcontrol.h
index d64447fdb..ea4bae56d 100644
--- a/src/plugins/wmf/player/evr9videowindowcontrol.h
+++ b/src/plugins/wmf/player/evr9videowindowcontrol.h
@@ -85,10 +85,12 @@ public:
     int saturation() const;
     void setSaturation(int saturation);
 
-    IMFActivate* currentActivate() const;
+    IMFActivate* createActivate();
 
-private:
     void setProcAmpValues();
+
+private:
+    void clear();
     DXVA2_Fixed32 scaleProcAmpValue(DWORD prop, int value) const;
 
     WId m_windowId;
diff --git a/src/plugins/wmf/player/mfaudioendpointcontrol.cpp b/src/plugins/wmf/player/mfaudioendpointcontrol.cpp
index 6d421fd06..7639f4f9e 100644
--- a/src/plugins/wmf/player/mfaudioendpointcontrol.cpp
+++ b/src/plugins/wmf/player/mfaudioendpointcontrol.cpp
@@ -46,17 +46,23 @@ MFAudioEndpointControl::MFAudioEndpointControl(QObject *parent)
     : QAudioOutputSelectorControl(parent)
     , m_currentActivate(0)
 {
-    updateEndpoints();
-    setActiveOutput(m_defaultEndpoint);
 }
 
 MFAudioEndpointControl::~MFAudioEndpointControl()
 {
+    clear();
+}
+
+void MFAudioEndpointControl::clear()
+{
+    m_activeEndpoint.clear();
+
     foreach (LPWSTR wstrID, m_devices)
          CoTaskMemFree(wstrID);
 
     if (m_currentActivate)
         m_currentActivate->Release();
+    m_currentActivate = NULL;
 }
 
 QList<QString> MFAudioEndpointControl::availableOutputs() const
@@ -119,8 +125,13 @@ void MFAudioEndpointControl::setActiveOutput(const QString &name)
     m_activeEndpoint = name;
 }
 
-IMFActivate*  MFAudioEndpointControl::currentActivate() const
+IMFActivate*  MFAudioEndpointControl::createActivate()
 {
+    clear();
+
+    updateEndpoints();
+    setActiveOutput(m_defaultEndpoint);
+
     return m_currentActivate;
 }
 
diff --git a/src/plugins/wmf/player/mfaudioendpointcontrol.h b/src/plugins/wmf/player/mfaudioendpointcontrol.h
index 1e7fc58be..53c6657cb 100644
--- a/src/plugins/wmf/player/mfaudioendpointcontrol.h
+++ b/src/plugins/wmf/player/mfaudioendpointcontrol.h
@@ -68,9 +68,10 @@ public:
 
     void setActiveOutput(const QString& name);
 
-    IMFActivate* currentActivate() const;
+    IMFActivate* createActivate();
 
 private:
+    void clear();
     void updateEndpoints();
 
     QString m_defaultEndpoint;
diff --git a/src/plugins/wmf/player/mfplayerservice.cpp b/src/plugins/wmf/player/mfplayerservice.cpp
index 2ca74ad3e..5bda9f983 100644
--- a/src/plugins/wmf/player/mfplayerservice.cpp
+++ b/src/plugins/wmf/player/mfplayerservice.cpp
@@ -71,6 +71,8 @@ MFPlayerService::MFPlayerService(QObject *parent)
 
 MFPlayerService::~MFPlayerService()
 {
+    m_session->close();
+
 #ifndef Q_WS_SIMULATOR
     if (m_videoWindowControl)
         delete m_videoWindowControl;
@@ -79,7 +81,6 @@ MFPlayerService::~MFPlayerService()
     if (m_videoRendererControl)
         delete m_videoRendererControl;
 
-    m_session->close();
     m_session->Release();
 }
 
diff --git a/src/plugins/wmf/player/mfplayersession.cpp b/src/plugins/wmf/player/mfplayersession.cpp
index e9c40567c..d9ff0e7cb 100644
--- a/src/plugins/wmf/player/mfplayersession.cpp
+++ b/src/plugins/wmf/player/mfplayersession.cpp
@@ -411,8 +411,9 @@ MFPlayerSession::MFPlayerSession(MFPlayerService *playerService)
     , m_volumeControl(0)
     , m_netsourceStatistics(0)
     , m_hCloseEvent(0)
+    , m_closing(false)
     , m_pendingRate(1)
-    , m_volume(1)
+    , m_volume(100)
     , m_muted(false)
     , m_status(QMediaPlayer::NoMedia)
     , m_scrubbing(false)
@@ -422,10 +423,6 @@ MFPlayerSession::MFPlayerSession(MFPlayerService *playerService)
     , m_audioSampleGrabberNode(0)
     , m_videoProbeMFT(0)
 {
-    m_hCloseEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
-    m_sourceResolver = new SourceResolver();
-    QObject::connect(m_sourceResolver, SIGNAL(mediaSourceReady()), this, SLOT(handleMediaSourceReady()));
-    QObject::connect(m_sourceResolver, SIGNAL(error(long)), this, SLOT(handleSourceError(long)));
     QObject::connect(this, SIGNAL(sessionEvent(IMFMediaEvent *)), this, SLOT(handleSessionEvent(IMFMediaEvent *)));
 
     m_pendingState = NoPending;
@@ -438,27 +435,31 @@ MFPlayerSession::MFPlayerSession(MFPlayerService *playerService)
     m_request.prevCmd = CmdNone;
     m_request.rate = 1.0f;
 
-    createSession();
-    PropVariantInit(&m_varStart);
-    m_varStart.vt = VT_I8;
-    m_varStart.uhVal.QuadPart = 0;
-
     m_audioSampleGrabber = new AudioSampleGrabberCallback;
     m_videoProbeMFT = new MFTransform;
 }
 
 void MFPlayerSession::close()
 {
+#ifdef DEBUG_MEDIAFOUNDATION
+    qDebug() << "close";
+#endif
+
     clear();
+    if (!m_session)
+        return;
+
     HRESULT hr = S_OK;
     if (m_session) {
+        m_closing = true;
         hr = m_session->Close();
         if (SUCCEEDED(hr)) {
-            DWORD dwWaitResult = WaitForSingleObject(m_hCloseEvent, 5000);
+            DWORD dwWaitResult = WaitForSingleObject(m_hCloseEvent, 100);
             if (dwWaitResult == WAIT_TIMEOUT) {
                 qWarning() << "session close time out!";
             }
         }
+         m_closing = false;
     }
 
     if (SUCCEEDED(hr)) {
@@ -475,7 +476,9 @@ void MFPlayerSession::close()
     if (m_session)
         m_session->Release();
     m_session = 0;
-    CloseHandle(m_hCloseEvent);
+    if (m_hCloseEvent)
+        CloseHandle(m_hCloseEvent);
+    m_hCloseEvent = 0;
 }
 
 void MFPlayerSession::addProbe(MFAudioProbeControl *probe)
@@ -522,6 +525,7 @@ void MFPlayerSession::load(const QMediaContent &media, QIODevice *stream)
         changeStatus(QMediaPlayer::InvalidMedia);
         emit error(QMediaPlayer::ResourceError, tr("Invalid stream source."), true);
     } else {
+        createSession();
         changeStatus(QMediaPlayer::LoadingMedia);
         m_sourceResolver->load(resources, stream);
     }
@@ -543,6 +547,10 @@ void MFPlayerSession::handleSourceError(long hr)
     case NS_E_SERVER_NOT_FOUND:
         errorString = tr("The specified server could not be found.");
         break;
+    case MF_E_UNSUPPORTED_BYTESTREAM_TYPE:
+        errorCode = QMediaPlayer::FormatError;
+        errorString = tr("Unsupported media type.");
+        break;
     default:
         errorString = tr("Failed to load source.");
         break;
@@ -638,6 +646,7 @@ void MFPlayerSession::setupPlaybackTopology(IMFMediaSource *source, IMFPresentat
                             break;
                         }
                     }
+                    outputNode->Release();
                 }
                 sourceNode->Release();
             }
@@ -703,14 +712,14 @@ IMFTopologyNode* MFPlayerSession::addOutputNode(IMFStreamDescriptor *streamDesc,
             IMFActivate *activate = NULL;
             if (MFMediaType_Audio == guidMajorType) {
                 mediaType = Audio;
-                activate = m_playerService->audioEndpointControl()->currentActivate();
+                activate = m_playerService->audioEndpointControl()->createActivate();
             } else if (MFMediaType_Video == guidMajorType) {
                 mediaType = Video;
                 if (m_playerService->videoRendererControl()) {
-                    activate = m_playerService->videoRendererControl()->currentActivate();
+                    activate = m_playerService->videoRendererControl()->createActivate();
 #ifndef Q_WS_SIMULATOR
                 } else if (m_playerService->videoWindowControl()) {
-                    activate = m_playerService->videoWindowControl()->currentActivate();
+                    activate = m_playerService->videoWindowControl()->createActivate();
 #endif
                 } else {
                     qWarning() << "no videoWindowControl or videoRendererControl, unable to add output node for video data";
@@ -1136,6 +1145,7 @@ void MFPlayerSession::pause()
     } else {
         if (m_state.command == CmdPause)
             return;
+
         if (SUCCEEDED(m_session->Pause())) {
             m_state.setCommand(CmdPause);
             m_pendingState = CmdPending;
@@ -1163,6 +1173,14 @@ QMediaPlayer::MediaStatus MFPlayerSession::status() const
 
 void MFPlayerSession::createSession()
 {
+    close();
+
+    m_hCloseEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+
+    m_sourceResolver = new SourceResolver();
+    QObject::connect(m_sourceResolver, SIGNAL(mediaSourceReady()), this, SLOT(handleMediaSourceReady()));
+    QObject::connect(m_sourceResolver, SIGNAL(error(long)), this, SLOT(handleSourceError(long)));
+
     Q_ASSERT(m_session == NULL);
     HRESULT hr = MFCreateMediaSession(NULL, &m_session);
     if (FAILED(hr)) {
@@ -1176,6 +1194,10 @@ void MFPlayerSession::createSession()
         changeStatus(QMediaPlayer::UnknownMediaStatus);
         emit error(QMediaPlayer::ResourceError, tr("Unable to pull session events."), false);
     }
+
+    PropVariantInit(&m_varStart);
+    m_varStart.vt = VT_I8;
+    m_varStart.hVal.QuadPart = 0;
 }
 
 qint64 MFPlayerSession::position()
@@ -1511,7 +1533,8 @@ HRESULT MFPlayerSession::Invoke(IMFAsyncResult *pResult)
         }
     }
 
-    emit sessionEvent(pEvent);
+    if (!m_closing)
+        emit sessionEvent(pEvent);
     return S_OK;
 }
 
@@ -1569,6 +1592,13 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent)
     case MESessionStarted:
         if (!m_scrubbing)
             updatePendingCommands(CmdStart);
+#ifndef Q_WS_SIMULATOR
+        // playback started, we can now set again the procAmpValues if they have been
+        // changed previously (these are lost when loading a new media)
+        if (m_playerService->videoWindowControl()) {
+            m_playerService->videoWindowControl()->setProcAmpValues();
+        }
+#endif
         break;
     case MESessionStopped:
         if (m_status != QMediaPlayer::EndOfMedia) {
@@ -1595,6 +1625,37 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent)
             qDebug() << "MEReconnectEnd" << ((hrStatus == S_OK) ? "OK" : "Failed");
 #endif
         break;
+    case MESessionTopologySet:
+        if (FAILED(hrStatus)) {
+            changeStatus(QMediaPlayer::InvalidMedia);
+            emit error(QMediaPlayer::FormatError, tr("Unsupported media, a codec is missing."), true);
+        } else {
+            if (m_audioSampleGrabberNode) {
+                IMFMediaType *mediaType = 0;
+                hr = MFGetTopoNodeCurrentType(m_audioSampleGrabberNode, 0, FALSE, &mediaType);
+                if (SUCCEEDED(hr)) {
+                    m_audioSampleGrabber->setFormat(audioFormatForMFMediaType(mediaType));
+                    mediaType->Release();
+                }
+            }
+
+            if (SUCCEEDED(MFGetService(m_session, MR_POLICY_VOLUME_SERVICE, IID_PPV_ARGS(&m_volumeControl)))) {
+                m_volumeControl->SetMasterVolume(m_volume * 0.01f);
+                m_volumeControl->SetMute(m_muted);
+            }
+
+            DWORD dwCharacteristics = 0;
+            m_sourceResolver->mediaSource()->GetCharacteristics(&dwCharacteristics);
+            emit seekableUpdate(MFMEDIASOURCE_CAN_SEEK & dwCharacteristics);
+
+            // Topology is resolved and successfuly set, this happens only after loading a new media.
+            // Make sure we always start the media from the beginning
+            m_varStart.vt = VT_I8;
+            m_varStart.hVal.QuadPart = 0;
+
+            changeStatus(QMediaPlayer::LoadedMedia);
+        }
+        break;
     }
 
     if (FAILED(hrStatus)) {
@@ -1631,9 +1692,10 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent)
         if (m_volumeControl) {
             float currentVolume = 1;
             if (SUCCEEDED(m_volumeControl->GetMasterVolume(&currentVolume))) {
-                if (currentVolume != m_volume) {
-                    m_volume = currentVolume;
-                    emit volumeChanged(int(m_volume * 100));
+                int scaledVolume = currentVolume * 100;
+                if (scaledVolume != m_volume) {
+                    m_volume = scaledVolume;
+                    emit volumeChanged(scaledVolume);
                 }
             }
             BOOL currentMuted = FALSE;
@@ -1645,26 +1707,6 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent)
             }
         }
         break;
-    case MESessionTopologySet: {
-            if (m_audioSampleGrabberNode) {
-                IMFMediaType *mediaType = 0;
-                hr = MFGetTopoNodeCurrentType(m_audioSampleGrabberNode, 0, FALSE, &mediaType);
-                if (SUCCEEDED(hr)) {
-                    m_audioSampleGrabber->setFormat(audioFormatForMFMediaType(mediaType));
-                    mediaType->Release();
-                }
-            }
-
-            if (SUCCEEDED(MFGetService(m_session, MR_POLICY_VOLUME_SERVICE, IID_PPV_ARGS(&m_volumeControl)))) {
-                m_volumeControl->SetMasterVolume(m_volume);
-                m_volumeControl->SetMute(m_muted);
-            }
-            DWORD dwCharacteristics = 0;
-            m_sourceResolver->mediaSource()->GetCharacteristics(&dwCharacteristics);
-            emit seekableUpdate(MFMEDIASOURCE_CAN_SEEK & dwCharacteristics);
-            changeStatus(QMediaPlayer::LoadedMedia);
-        }
-        break;
     case MESessionTopologyStatus: {
             UINT32 status;
             if (SUCCEEDED(sessionEvent->GetUINT32(MF_EVENT_TOPOLOGY_STATUS, &status))) {
diff --git a/src/plugins/wmf/player/mfplayersession.h b/src/plugins/wmf/player/mfplayersession.h
index b050ad09f..b8b6f085e 100644
--- a/src/plugins/wmf/player/mfplayersession.h
+++ b/src/plugins/wmf/player/mfplayersession.h
@@ -178,6 +178,7 @@ private:
 
     SourceResolver  *m_sourceResolver;
     HANDLE           m_hCloseEvent;
+    bool m_closing;
 
     enum MediaType
     {
diff --git a/src/plugins/wmf/player/mfvideorenderercontrol.cpp b/src/plugins/wmf/player/mfvideorenderercontrol.cpp
index 8d47b1aac..c3c5c1ae4 100644
--- a/src/plugins/wmf/player/mfvideorenderercontrol.cpp
+++ b/src/plugins/wmf/player/mfvideorenderercontrol.cpp
@@ -2130,17 +2130,23 @@ namespace
 MFVideoRendererControl::MFVideoRendererControl(QObject *parent)
     : QVideoRendererControl(parent)
     , m_surface(0)
+    , m_currentActivate(0)
     , m_callback(0)
 {
-    m_currentActivate = new VideoRendererActivate(this);
 }
 
 MFVideoRendererControl::~MFVideoRendererControl()
 {
+    clear();
+}
+
+void MFVideoRendererControl::clear()
+{
     if (m_currentActivate) {
         m_currentActivate->ShutdownObject();
         m_currentActivate->Release();
     }
+    m_currentActivate = NULL;
 }
 
 QAbstractVideoSurface *MFVideoRendererControl::surface() const
@@ -2150,9 +2156,6 @@ QAbstractVideoSurface *MFVideoRendererControl::surface() const
 
 void MFVideoRendererControl::setSurface(QAbstractVideoSurface *surface)
 {
-    if (m_surface == surface)
-        return;
-
     if (m_surface)
         disconnect(m_surface, SIGNAL(supportedFormatsChanged()), this, SLOT(supportedFormatsChanged()));
     m_surface = surface;
@@ -2160,11 +2163,16 @@ void MFVideoRendererControl::setSurface(QAbstractVideoSurface *surface)
     if (m_surface) {
         connect(m_surface, SIGNAL(supportedFormatsChanged()), this, SLOT(supportedFormatsChanged()));
     }
-    static_cast<VideoRendererActivate*>(m_currentActivate)->setSurface(m_surface);
+
+    if (m_currentActivate)
+        static_cast<VideoRendererActivate*>(m_currentActivate)->setSurface(m_surface);
 }
 
 void MFVideoRendererControl::customEvent(QEvent *event)
 {
+    if (!m_currentActivate)
+        return;
+
     if (event->type() == MediaStream::PresentSurface) {
         MFTIME targetTime = static_cast<MediaStream::PresentEvent*>(event)->targetTime();
         MFTIME currentTime = static_cast<VideoRendererActivate*>(m_currentActivate)->getTime();
@@ -2185,16 +2193,26 @@ void MFVideoRendererControl::customEvent(QEvent *event)
 
 void MFVideoRendererControl::supportedFormatsChanged()
 {
-    static_cast<VideoRendererActivate*>(m_currentActivate)->supportedFormatsChanged();
+    if (m_currentActivate)
+        static_cast<VideoRendererActivate*>(m_currentActivate)->supportedFormatsChanged();
 }
 
 void MFVideoRendererControl::present()
 {
-    static_cast<VideoRendererActivate*>(m_currentActivate)->present();
+    if (m_currentActivate)
+        static_cast<VideoRendererActivate*>(m_currentActivate)->present();
 }
 
-IMFActivate* MFVideoRendererControl::currentActivate() const
+IMFActivate* MFVideoRendererControl::createActivate()
 {
+    clear();
+
+    m_currentActivate = new VideoRendererActivate(this);
+    if (m_surface) {
+        setSurface(m_surface);
+        supportedFormatsChanged();
+    }
+
     return m_currentActivate;
 }
 
diff --git a/src/plugins/wmf/player/mfvideorenderercontrol.h b/src/plugins/wmf/player/mfvideorenderercontrol.h
index 25adcf269..ba04e73b7 100644
--- a/src/plugins/wmf/player/mfvideorenderercontrol.h
+++ b/src/plugins/wmf/player/mfvideorenderercontrol.h
@@ -58,7 +58,7 @@ public:
     QAbstractVideoSurface *surface() const;
     void setSurface(QAbstractVideoSurface *surface);
 
-    IMFActivate* currentActivate() const;
+    IMFActivate* createActivate();
 
 protected:
     void customEvent(QEvent *event);
@@ -68,6 +68,8 @@ private Q_SLOTS:
     void present();
 
 private:
+    void clear();
+
     QAbstractVideoSurface *m_surface;
     IMFActivate *m_currentActivate;
     IMFSampleGrabberSinkCallback *m_callback;
diff --git a/src/plugins/wmf/sourceresolver.cpp b/src/plugins/wmf/sourceresolver.cpp
index c5d99959a..9abe65845 100644
--- a/src/plugins/wmf/sourceresolver.cpp
+++ b/src/plugins/wmf/sourceresolver.cpp
@@ -108,6 +108,10 @@ STDMETHODIMP_(ULONG) SourceResolver::Release(void)
 HRESULT STDMETHODCALLTYPE SourceResolver::Invoke(IMFAsyncResult *pAsyncResult)
 {
     QMutexLocker locker(&m_mutex);
+
+    if (!m_sourceResolver)
+        return S_OK;
+
     MF_OBJECT_TYPE ObjectType = MF_OBJECT_INVALID;
     IUnknown* pSource = NULL;
     State *state = static_cast<State*>(pAsyncResult->GetStateNoAddRef());
diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro
index b9c2b4152..fcd2a3268 100644
--- a/src/plugins/wmf/wmf.pro
+++ b/src/plugins/wmf/wmf.pro
@@ -6,9 +6,9 @@ QT += multimedia-private network
 }
 
 PLUGIN_TYPE=mediaservice
+PLUGIN_CLASS_NAME = WMFServicePlugin
 load(qt_plugin)
 
-DEPENDPATH += .
 INCLUDEPATH += .
 
 HEADERS += \
diff --git a/src/plugins/wmf/wmfserviceplugin.cpp b/src/plugins/wmf/wmfserviceplugin.cpp
index 9d1a359db..8cff66f30 100644
--- a/src/plugins/wmf/wmfserviceplugin.cpp
+++ b/src/plugins/wmf/wmfserviceplugin.cpp
@@ -92,8 +92,8 @@ QMediaService* WMFServicePlugin::create(QString const& key)
 
 void WMFServicePlugin::release(QMediaService *service)
 {
-    releaseRefCount();
     delete service;
+    releaseRefCount();
 }
 
 QMediaServiceProviderHint::Features WMFServicePlugin::supportedFeatures(
diff --git a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro
index 9a825fef2..da4d0dc1a 100644
--- a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro
+++ b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro
@@ -9,7 +9,6 @@ DEFINES += QT_BUILD_QTMM_QUICK_LIB
 # Header files must go inside source directory of a module
 # to be installed by syncqt.
 INCLUDEPATH += ../multimedia/qtmultimediaquicktools_headers/
-DEPENDPATH += ../multimedia/qtmultimediaquicktools_headers/
 
 PRIVATE_HEADERS += \
     ../multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h \
diff --git a/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro b/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro
index f15ee4422..80ce0c112 100644
--- a/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro
+++ b/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro
@@ -1,7 +1,6 @@
 TARGET = tst_qaudiodecoderbackend
 
 QT += multimedia multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
 CONFIG += testcase insignificant_test
diff --git a/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro b/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro
index 387a14136..69bd792bc 100644
--- a/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro
+++ b/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro
@@ -1,7 +1,6 @@
 TARGET = tst_qaudiodeviceinfo
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
 CONFIG += testcase insignificant_test
diff --git a/tests/auto/integration/qaudioinput/qaudioinput.pro b/tests/auto/integration/qaudioinput/qaudioinput.pro
index bd8ea78ce..a3e0ad31a 100644
--- a/tests/auto/integration/qaudioinput/qaudioinput.pro
+++ b/tests/auto/integration/qaudioinput/qaudioinput.pro
@@ -1,7 +1,6 @@
 TARGET = tst_qaudioinput
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
 CONFIG += testcase insignificant_test
diff --git a/tests/auto/integration/qaudiooutput/qaudiooutput.pro b/tests/auto/integration/qaudiooutput/qaudiooutput.pro
index 62f5063b2..5933e7368 100644
--- a/tests/auto/integration/qaudiooutput/qaudiooutput.pro
+++ b/tests/auto/integration/qaudiooutput/qaudiooutput.pro
@@ -1,7 +1,6 @@
 TARGET = tst_qaudiooutput
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
 CONFIG += testcase
diff --git a/tests/auto/integration/qcamerabackend/qcamerabackend.pro b/tests/auto/integration/qcamerabackend/qcamerabackend.pro
index 2d3550cff..50da92fbd 100644
--- a/tests/auto/integration/qcamerabackend/qcamerabackend.pro
+++ b/tests/auto/integration/qcamerabackend/qcamerabackend.pro
@@ -1,7 +1,6 @@
 TARGET = tst_qcamerabackend
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
 CONFIG += testcase
diff --git a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
index 16a852889..b9be929ea 100644
--- a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
+++ b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
@@ -1,7 +1,6 @@
 TARGET = tst_qdeclarativevideooutput
 
 QT += multimedia-private qml testlib quick
-CONFIG += no_private_qt_headers_warning
 CONFIG += testcase
 
 OTHER_FILES += \
diff --git a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro
index 222ed5139..3cc5e0980 100644
--- a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro
+++ b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro
@@ -1,7 +1,6 @@
 TARGET = tst_qdeclarativevideooutput_window
 
 QT += multimedia-private qml testlib quick
-CONFIG += no_private_qt_headers_warning
 CONFIG += testcase
 
 OTHER_FILES += \
@@ -12,3 +11,5 @@ SOURCES += \
 
 INCLUDEPATH += ../../../../src/imports/multimedia
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+win32:contains(QT_CONFIG, angle): CONFIG += insignificant_test # QTBUG-28541
diff --git a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro
index 7dc62b624..79028d885 100644
--- a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro
+++ b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro
@@ -1,7 +1,6 @@
 TARGET = tst_qmediaplayerbackend
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
 CONFIG += testcase insignificant_test
diff --git a/tests/auto/integration/qml/qml.pro b/tests/auto/integration/qml/qml.pro
index 63dd09557..cd02af680 100644
--- a/tests/auto/integration/qml/qml.pro
+++ b/tests/auto/integration/qml/qml.pro
@@ -1,6 +1,6 @@
 TEMPLATE=app
 TARGET=tst_qml
-CONFIG += warn_on qmltestcase
+CONFIG += qmltestcase
 SOURCES += tst_qml.cpp
 
 
diff --git a/tests/auto/integration/qsound/qsound.pro b/tests/auto/integration/qsound/qsound.pro
index 0a0ed09c3..e2d4434e9 100644
--- a/tests/auto/integration/qsound/qsound.pro
+++ b/tests/auto/integration/qsound/qsound.pro
@@ -1,7 +1,6 @@
 TARGET = tst_qsound
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
 CONFIG += testcase
diff --git a/tests/auto/integration/qsoundeffect/qsoundeffect.pro b/tests/auto/integration/qsoundeffect/qsoundeffect.pro
index 2fffaf716..cb186db20 100644
--- a/tests/auto/integration/qsoundeffect/qsoundeffect.pro
+++ b/tests/auto/integration/qsoundeffect/qsoundeffect.pro
@@ -1,7 +1,6 @@
 TARGET = tst_qsoundeffect
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
 CONFIG += testcase
diff --git a/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro b/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro
index 22cf71446..dc449358c 100644
--- a/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro
+++ b/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qabstractvideobuffer
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qabstractvideobuffer.cpp
 
diff --git a/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro b/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro
index 4d8f9f1f3..62e4c60da 100644
--- a/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro
+++ b/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qabstractvideosurface
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qabstractvideosurface.cpp
 
diff --git a/tests/auto/unit/qaudioformat/qaudioformat.pro b/tests/auto/unit/qaudioformat/qaudioformat.pro
index b9edca093..40ef06b51 100644
--- a/tests/auto/unit/qaudioformat/qaudioformat.pro
+++ b/tests/auto/unit/qaudioformat/qaudioformat.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qaudioformat
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qaudioformat.cpp
 
diff --git a/tests/auto/unit/qaudionamespace/qaudionamespace.pro b/tests/auto/unit/qaudionamespace/qaudionamespace.pro
index 40b8107fd..78e99dd5d 100644
--- a/tests/auto/unit/qaudionamespace/qaudionamespace.pro
+++ b/tests/auto/unit/qaudionamespace/qaudionamespace.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qaudionamespace
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qaudionamespace.cpp
 
diff --git a/tests/auto/unit/qcamera/qcamera.pro b/tests/auto/unit/qcamera/qcamera.pro
index 1e10098a9..1f31c7f1f 100644
--- a/tests/auto/unit/qcamera/qcamera.pro
+++ b/tests/auto/unit/qcamera/qcamera.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qcamera
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 include (../qmultimedia_common/mock.pri)
 include (../qmultimedia_common/mockcamera.pri)
diff --git a/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro b/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro
index 1a8e66a16..e6b43e166 100644
--- a/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro
+++ b/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qcameraimagecapture
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += \
     tst_qcameraimagecapture.cpp
diff --git a/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro b/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro
index 3c2b4bb2e..6f6aba04a 100644
--- a/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro
+++ b/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qcameraviewfinder
 
 QT += multimedia-private multimediawidgets-private testlib
-CONFIG += no_private_qt_headers_warning
 
 include (../qmultimedia_common/mock.pri)
 include (../qmultimedia_common/mockcamera.pri)
diff --git a/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro b/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro
index adaed0b56..dbab97ab3 100644
--- a/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro
+++ b/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qcamerawidgets
 
 QT += multimedia-private multimediawidgets-private testlib
-CONFIG += no_private_qt_headers_warning
 
 include (../qmultimedia_common/mock.pri)
 include (../qmultimedia_common/mockcamera.pri)
diff --git a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro
index 756ba3f68..6471f7b2a 100644
--- a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro
+++ b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro
@@ -2,15 +2,14 @@ CONFIG += testcase
 TARGET = tst_qdeclarativeaudio
 
 QT += multimedia-private qml testlib
-CONFIG += no_private_qt_headers_warning
 
 HEADERS += \
-        $$QT.multimedia.sources/../imports/multimedia/qdeclarativeaudio_p.h \
-        $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediametadata_p.h
+        ../../../../src/imports/multimedia/qdeclarativeaudio_p.h \
+        ../../../../src/imports/multimedia/qdeclarativemediametadata_p.h
 
 SOURCES += \
         tst_qdeclarativeaudio.cpp \
-        $$QT.multimedia.sources/../imports/multimedia/qdeclarativeaudio.cpp
+        ../../../../src/imports/multimedia/qdeclarativeaudio.cpp
 
-INCLUDEPATH += $$QT.multimedia.sources/../imports/multimedia
+INCLUDEPATH += ../../../../src/imports/multimedia
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro b/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro
index c9435ea7f..239485509 100644
--- a/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro
+++ b/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro
@@ -2,18 +2,17 @@ CONFIG += testcase
 TARGET = tst_qdeclarativevideo
 
 QT += multimedia-private qml testlib
-CONFIG += no_private_qt_headers_warning
 
 HEADERS += \
-        $$QT.multimedia.sources/../imports/multimedia/qdeclarativevideo_p.h \
-        $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediabase_p.h \
-        $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediametadata_p.h
+        ../../../../src/imports/multimedia/qdeclarativevideo_p.h \
+        ../../../../src/imports/multimedia/qdeclarativemediabase_p.h \
+        ../../../../src/imports/multimedia/qdeclarativemediametadata_p.h
 
 SOURCES += \
         tst_qdeclarativevideo.cpp \
-        $$QT.multimedia.sources/../imports/multimedia/qdeclarativevideo.cpp \
-        $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediabase.cpp
+        ../../../../src/imports/multimedia/qdeclarativevideo.cpp \
+        ../../../../src/imports/multimedia/qdeclarativemediabase.cpp
 
-INCLUDEPATH += $$QT.multimedia.sources/../imports/multimedia
+INCLUDEPATH += ../../../../src/imports/multimedia
 QT+=widgets
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro b/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro
index 81fa546cf..ebbac5b6e 100644
--- a/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro
+++ b/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qgraphicsvideoitem
 
 QT += multimedia-private multimediawidgets-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qgraphicsvideoitem.cpp
 
diff --git a/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro b/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro
index 882bd2e5f..0e269c1d1 100644
--- a/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro
+++ b/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qmediabindableinterface
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += \
     tst_qmediabindableinterface.cpp
diff --git a/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro b/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro
index 300d8f5d2..32b6276e9 100644
--- a/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro
+++ b/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qmediacontainercontrol
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediacontainercontrol.cpp
 
diff --git a/tests/auto/unit/qmediacontent/qmediacontent.pro b/tests/auto/unit/qmediacontent/qmediacontent.pro
index c42093afb..56e0e055a 100644
--- a/tests/auto/unit/qmediacontent/qmediacontent.pro
+++ b/tests/auto/unit/qmediacontent/qmediacontent.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qmediacontent
 
 QT += multimedia-private network testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediacontent.cpp
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro b/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro
index 16618eaa4..97dba9339 100644
--- a/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro
+++ b/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro
@@ -4,16 +4,15 @@ TARGET = tst_qmediaplaylist
 include (../qmultimedia_common/mockplaylist.pri)
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 HEADERS += \
-    $$QT.multimedia.sources/../plugins/m3u/qm3uhandler.h
+    ../../../../src/plugins/m3u/qm3uhandler.h
 
 SOURCES += \
     tst_qmediaplaylist.cpp \
-    $$QT.multimedia.sources/../plugins/m3u/qm3uhandler.cpp
+    ../../../../src/plugins/m3u/qm3uhandler.cpp
 
-INCLUDEPATH += $$QT.multimedia.sources/../plugins/m3u
+INCLUDEPATH += ../../../../src/plugins/m3u
 
 TESTDATA += testdata/*
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro b/tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
index 07cc32755..84bbddbcb 100644
--- a/tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
+++ b/tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qmediaplaylistnavigator
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediaplaylistnavigator.cpp
 
diff --git a/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro b/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro
index 6c8bd817e..36351ce7b 100644
--- a/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro
+++ b/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qmediapluginloader
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediapluginloader.cpp
 
diff --git a/tests/auto/unit/qmediaresource/qmediaresource.pro b/tests/auto/unit/qmediaresource/qmediaresource.pro
index ea75d9df9..dcc0bffcc 100644
--- a/tests/auto/unit/qmediaresource/qmediaresource.pro
+++ b/tests/auto/unit/qmediaresource/qmediaresource.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qmediaresource
 
 QT += network multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediaresource.cpp
 
diff --git a/tests/auto/unit/qmediaservice/qmediaservice.pro b/tests/auto/unit/qmediaservice/qmediaservice.pro
index fe6481d21..bdf49b74c 100644
--- a/tests/auto/unit/qmediaservice/qmediaservice.pro
+++ b/tests/auto/unit/qmediaservice/qmediaservice.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qmediaservice
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediaservice.cpp
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
index ad311169e..68dee28a9 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
@@ -1,8 +1,8 @@
 TARGET = mockserviceplugin1
 QT += multimedia-private
-CONFIG += no_private_qt_headers_warning
 
 PLUGIN_TYPE=mediaservice
+PLUGIN_CLASS_NAME = MockServicePlugin1
 load(qt_plugin)
 
 DESTDIR = ../$${PLUGIN_TYPE}
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
index 6b30d7772..98a3ca4a4 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
@@ -1,8 +1,8 @@
 TARGET = mockserviceplugin2
 QT += multimedia-private
-CONFIG += no_private_qt_headers_warning
 
 PLUGIN_TYPE=mediaservice
+PLUGIN_CLASS_NAME = MockServicePlugin2
 load(qt_plugin)
 
 DESTDIR = ../$${PLUGIN_TYPE}
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
index bae1af983..50def293f 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
@@ -1,8 +1,8 @@
 TARGET = mockserviceplugin3
 QT += multimedia-private
-CONFIG += no_private_qt_headers_warning
 
 PLUGIN_TYPE=mediaservice
+PLUGIN_CLASS_NAME = MockServicePlugin3
 load(qt_plugin)
 
 DESTDIR = ../$${PLUGIN_TYPE}
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
index ccd8b0eda..57b715f52 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
@@ -1,8 +1,8 @@
 TARGET = mockserviceplugin4
 QT += multimedia-private
-CONFIG += no_private_qt_headers_warning
 
 PLUGIN_TYPE=mediaservice
+PLUGIN_CLASS_NAME = MockServicePlugin4
 load(qt_plugin)
 
 DESTDIR = ../$${PLUGIN_TYPE}
diff --git a/tests/auto/unit/qmediaserviceprovider/test/test.pro b/tests/auto/unit/qmediaserviceprovider/test/test.pro
index c1d584ac1..38b6febf8 100644
--- a/tests/auto/unit/qmediaserviceprovider/test/test.pro
+++ b/tests/auto/unit/qmediaserviceprovider/test/test.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = ../tst_qmediaserviceprovider
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += ../tst_qmediaserviceprovider.cpp
 
diff --git a/tests/auto/unit/qmediatimerange/qmediatimerange.pro b/tests/auto/unit/qmediatimerange/qmediatimerange.pro
index 84bb2f57e..69af820cf 100644
--- a/tests/auto/unit/qmediatimerange/qmediatimerange.pro
+++ b/tests/auto/unit/qmediatimerange/qmediatimerange.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qmediatimerange
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediatimerange.cpp
 
diff --git a/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro b/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro
index e7ff03f0a..44eaf7e63 100644
--- a/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro
+++ b/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qmetadatareadercontrol
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmetadatareadercontrol.cpp
 
diff --git a/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro b/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro
index 910117169..70ca1ebea 100644
--- a/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro
+++ b/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qmetadatawritercontrol
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmetadatawritercontrol.cpp
 
diff --git a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
index 2bbc10b3d..4408c4f54 100644
--- a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
+++ b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qpaintervideosurface
 
 QT += multimedia-private multimediawidgets-private testlib
-CONFIG += no_private_qt_headers_warning
 contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
    QT += opengl
 } else {
@@ -15,3 +14,5 @@ SOURCES += tst_qpaintervideosurface.cpp
 
 QT+=widgets
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+win32:contains(QT_CONFIG, angle): CONFIG += insignificant_test # QTBUG-28542
diff --git a/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro b/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro
index f6c568d8c..58800eed9 100644
--- a/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro
+++ b/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qvideoencodersettingscontrol
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += \
     tst_qvideoencodersettingscontrol.cpp
diff --git a/tests/auto/unit/qvideoframe/qvideoframe.pro b/tests/auto/unit/qvideoframe/qvideoframe.pro
index 7df5b05df..1e2baa514 100644
--- a/tests/auto/unit/qvideoframe/qvideoframe.pro
+++ b/tests/auto/unit/qvideoframe/qvideoframe.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qvideoframe
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qvideoframe.cpp
 
diff --git a/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro b/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro
index e923e6020..a5c627aa8 100644
--- a/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro
+++ b/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qvideosurfaceformat
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qvideosurfaceformat.cpp
 
diff --git a/tests/auto/unit/qvideowidget/qvideowidget.pro b/tests/auto/unit/qvideowidget/qvideowidget.pro
index e9c1b2518..efeb91d39 100644
--- a/tests/auto/unit/qvideowidget/qvideowidget.pro
+++ b/tests/auto/unit/qvideowidget/qvideowidget.pro
@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qvideowidget
 
 QT += multimedia-private multimediawidgets-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qvideowidget.cpp
 
diff --git a/tests/auto/unit/qwavedecoder/qwavedecoder.pro b/tests/auto/unit/qwavedecoder/qwavedecoder.pro
index 18e74db0a..1b6af7e86 100644
--- a/tests/auto/unit/qwavedecoder/qwavedecoder.pro
+++ b/tests/auto/unit/qwavedecoder/qwavedecoder.pro
@@ -1,7 +1,7 @@
 TARGET = tst_qwavedecoder
-HEADERS += $$QT.multimedia.sources/audio/qwavedecoder_p.h
+HEADERS += ../../../../src/multimedia/audio/qwavedecoder_p.h
 SOURCES += tst_qwavedecoder.cpp \
-           $$QT.multimedia.sources/audio/qwavedecoder_p.cpp
+           ../../../../src/multimedia/audio/qwavedecoder_p.cpp
 
 QT += multimedia-private testlib network
 CONFIG += no_private_qt_headers_warning testcase