417 files changed, 796 insertions, 974 deletions

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/doc/images/video-qml-paint-rate.png b/examples/video/doc/images/video-qml-paint-rate.png
deleted file mode 100644
index 1519ff64e..000000000
--- a/examples/video/doc/images/video-qml-paint-rate.png
+++ /dev/null
diff --git a/examples/video/doc/src/video-qml-paint-rate.qdocinc b/examples/video/doc/src/video-qml-paint-rate.qdocinc
deleted file mode 100644
index 84098e241..000000000
--- a/examples/video/doc/src/video-qml-paint-rate.qdocinc
+++ /dev/null
@@ -1,43 +0,0 @@
-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
-\skipto class FrequencyMonitor : public QObject
-\printuntil Q_OBJECT
-\skipto Q_PROPERTY(qreal instantaneousFrequency
-\printuntil averageFrequencyChanged)
-\skipto public
-\printuntil :
-\dots
-\skipto static void qmlRegisterType
-\printuntil ;
-\skipto public slots
-\printuntil notify();
-\skipto };
-\printline };
-
-The FrequencyMonitor class is exposed to QML like this
-
-\quotefromfile 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
-\skipto import FrequencyMonitor
-\printuntil id: root
-\dots
-\skipto function notify
-\printuntil id: monitor
-\skipto onAverageFrequencyChanged
-\printuntil {
-\skipto averageFrequencyText
-\printuntil /^\}/
-
-The result looks like this:
-
-\image video-qml-paint-rate.png
-
-
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