diff --git a/.qmake.conf b/.qmake.conf
index 42ba8e45fb1fbff3ff9c88e788a4470fd72ce478..5de255cb69e5775ba5ede321121ef6a5efc52ab9 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1 +1,2 @@
load(qt_build_config)
+CONFIG += qt_example_installs
diff --git a/examples/audiodecoder/audiodecoder.pro b/examples/audiodecoder/audiodecoder.pro
deleted file mode 100644
index 3c238daa8bf5352874f5ab7c788729f29230a7d9..0000000000000000000000000000000000000000
--- 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 7bd5987626a1bf9b8e7c68bf82f854590d7b2e5f..0000000000000000000000000000000000000000
--- 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 e5e5c8dfc1f0ad1f4e05602abb9c3dcf65c891e9..0000000000000000000000000000000000000000
--- 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 d2ee4bd90ed261b2ee5ce9bd8d86ad3b513dd307..0000000000000000000000000000000000000000
--- 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 70aad8979ad83e62d6d22142636ff74198f1b2f9..0000000000000000000000000000000000000000
--- 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 2e0e798e96a72829ec7d28e6ddd4e4a8fa41e90c..0000000000000000000000000000000000000000
--- 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 6f4d005c642ec45fc3b685ded1b608cfb4887357..0000000000000000000000000000000000000000
--- 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 54d6f392e45fe4bde1b844d565ceaf6023843657..0000000000000000000000000000000000000000
--- 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 e536393d74be480da01ad87df56fb169ab1a77b3..0000000000000000000000000000000000000000
--- 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 cf9dae1b3b924549020c48c73c8a8854e31b94c2..979671672a981c0a08317b2ef9c6c9cb35f5e1d2 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
similarity index 100%
rename from examples/audiodecoder/audiodecoder.cpp
rename to examples/multimedia/audiodecoder/audiodecoder.cpp
diff --git a/examples/audiodecoder/audiodecoder.h b/examples/multimedia/audiodecoder/audiodecoder.h
similarity index 100%
rename from examples/audiodecoder/audiodecoder.h
rename to examples/multimedia/audiodecoder/audiodecoder.h
diff --git a/examples/multimedia/audiodecoder/audiodecoder.pro b/examples/multimedia/audiodecoder/audiodecoder.pro
new file mode 100644
index 0000000000000000000000000000000000000000..0a09c3cf38b9e414f00913791e8845634e7a9b09
--- /dev/null
+++ b/examples/multimedia/audiodecoder/audiodecoder.pro
@@ -0,0 +1,17 @@
+TEMPLATE = app
+TARGET = audiodecoder
+
+CONFIG += qt warn_on
+
+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
similarity index 100%
rename from examples/audiodecoder/main.cpp
rename to examples/multimedia/audiodecoder/main.cpp
diff --git a/examples/audiodecoder/wavefilewriter.cpp b/examples/multimedia/audiodecoder/wavefilewriter.cpp
similarity index 100%
rename from examples/audiodecoder/wavefilewriter.cpp
rename to examples/multimedia/audiodecoder/wavefilewriter.cpp
diff --git a/examples/audiodecoder/wavefilewriter.h b/examples/multimedia/audiodecoder/wavefilewriter.h
similarity index 100%
rename from examples/audiodecoder/wavefilewriter.h
rename to examples/multimedia/audiodecoder/wavefilewriter.h
diff --git a/examples/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp
similarity index 100%
rename from examples/audiodevices/audiodevices.cpp
rename to examples/multimedia/audiodevices/audiodevices.cpp
diff --git a/examples/audiodevices/audiodevices.h b/examples/multimedia/audiodevices/audiodevices.h
similarity index 100%
rename from examples/audiodevices/audiodevices.h
rename to examples/multimedia/audiodevices/audiodevices.h
diff --git a/examples/multimedia/audiodevices/audiodevices.pro b/examples/multimedia/audiodevices/audiodevices.pro
new file mode 100644
index 0000000000000000000000000000000000000000..71701543ea44f8e1bec66519bd6383391975f42b
--- /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
similarity index 100%
rename from examples/audiodevices/audiodevicesbase.ui
rename to examples/multimedia/audiodevices/audiodevicesbase.ui
diff --git a/examples/audiodevices/doc/images/audiodevices.png b/examples/multimedia/audiodevices/doc/images/audiodevices.png
similarity index 100%
rename from examples/audiodevices/doc/images/audiodevices.png
rename to examples/multimedia/audiodevices/doc/images/audiodevices.png
diff --git a/examples/audiodevices/doc/src/audiodevices.qdoc b/examples/multimedia/audiodevices/doc/src/audiodevices.qdoc
similarity index 100%
rename from examples/audiodevices/doc/src/audiodevices.qdoc
rename to examples/multimedia/audiodevices/doc/src/audiodevices.qdoc
diff --git a/examples/audiodevices/main.cpp b/examples/multimedia/audiodevices/main.cpp
similarity index 100%
rename from examples/audiodevices/main.cpp
rename to examples/multimedia/audiodevices/main.cpp
diff --git a/examples/multimedia/audioengine/audioengine.pro b/examples/multimedia/audioengine/audioengine.pro
new file mode 100644
index 0000000000000000000000000000000000000000..84bc492bcae2f65c0b2b8183d13894c1a65555c8
--- /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
similarity index 100%
rename from examples/audioengine/doc/src/audioengine.qdoc
rename to examples/multimedia/audioengine/doc/src/audioengine.qdoc
diff --git a/examples/audioengine/qml/audioengine.qml b/examples/multimedia/audioengine/qml/audioengine.qml
similarity index 100%
rename from examples/audioengine/qml/audioengine.qml
rename to examples/multimedia/audioengine/qml/audioengine.qml
diff --git a/examples/audioengine/qml/audioengine.qmlproject b/examples/multimedia/audioengine/qml/audioengine.qmlproject
similarity index 100%
rename from examples/audioengine/qml/audioengine.qmlproject
rename to examples/multimedia/audioengine/qml/audioengine.qmlproject
diff --git a/examples/audioengine/qml/content/MyAudioEngine.qml b/examples/multimedia/audioengine/qml/content/MyAudioEngine.qml
similarity index 100%
rename from examples/audioengine/qml/content/MyAudioEngine.qml
rename to examples/multimedia/audioengine/qml/content/MyAudioEngine.qml
diff --git a/examples/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp
similarity index 100%
rename from examples/audioinput/audioinput.cpp
rename to examples/multimedia/audioinput/audioinput.cpp
diff --git a/examples/audioinput/audioinput.h b/examples/multimedia/audioinput/audioinput.h
similarity index 100%
rename from examples/audioinput/audioinput.h
rename to examples/multimedia/audioinput/audioinput.h
diff --git a/examples/multimedia/audioinput/audioinput.pro b/examples/multimedia/audioinput/audioinput.pro
new file mode 100644
index 0000000000000000000000000000000000000000..b0dc57c274e004a9817b4c470dbd984a39d7847b
--- /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
similarity index 100%
rename from examples/audioinput/doc/images/audioinput-example.png
rename to 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
similarity index 100%
rename from examples/audioinput/doc/src/audioinput.qdoc
rename to examples/multimedia/audioinput/doc/src/audioinput.qdoc
diff --git a/examples/audioinput/main.cpp b/examples/multimedia/audioinput/main.cpp
similarity index 100%
rename from examples/audioinput/main.cpp
rename to examples/multimedia/audioinput/main.cpp
diff --git a/examples/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp
similarity index 100%
rename from examples/audiooutput/audiooutput.cpp
rename to examples/multimedia/audiooutput/audiooutput.cpp
diff --git a/examples/audiooutput/audiooutput.h b/examples/multimedia/audiooutput/audiooutput.h
similarity index 100%
rename from examples/audiooutput/audiooutput.h
rename to examples/multimedia/audiooutput/audiooutput.h
diff --git a/examples/multimedia/audiooutput/audiooutput.pro b/examples/multimedia/audiooutput/audiooutput.pro
new file mode 100644
index 0000000000000000000000000000000000000000..c843f010f604d9f43b8387f8c6c17a203e1b54f5
--- /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
similarity index 100%
rename from examples/audiooutput/doc/images/audiooutput-example.png
rename to 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
similarity index 100%
rename from examples/audiooutput/doc/src/audiooutput.qdoc
rename to examples/multimedia/audiooutput/doc/src/audiooutput.qdoc
diff --git a/examples/audiooutput/main.cpp b/examples/multimedia/audiooutput/main.cpp
similarity index 100%
rename from examples/audiooutput/main.cpp
rename to examples/multimedia/audiooutput/main.cpp
diff --git a/examples/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp
similarity index 100%
rename from examples/audiorecorder/audiorecorder.cpp
rename to examples/multimedia/audiorecorder/audiorecorder.cpp
diff --git a/examples/audiorecorder/audiorecorder.h b/examples/multimedia/audiorecorder/audiorecorder.h
similarity index 100%
rename from examples/audiorecorder/audiorecorder.h
rename to examples/multimedia/audiorecorder/audiorecorder.h
diff --git a/examples/audiorecorder/audiorecorder.pro b/examples/multimedia/audiorecorder/audiorecorder.pro
similarity index 58%
rename from examples/audiorecorder/audiorecorder.pro
rename to examples/multimedia/audiorecorder/audiorecorder.pro
index 7936d951afa7a941fc5969aa168940906e0dfb29..6fdc4b13d3d648b26de7f39ebccd73fe88d22ebe 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
similarity index 100%
rename from examples/audiorecorder/audiorecorder.ui
rename to examples/multimedia/audiorecorder/audiorecorder.ui
diff --git a/examples/audiorecorder/audiorecorder_small.ui b/examples/multimedia/audiorecorder/audiorecorder_small.ui
similarity index 100%
rename from examples/audiorecorder/audiorecorder_small.ui
rename to examples/multimedia/audiorecorder/audiorecorder_small.ui
diff --git a/examples/audiorecorder/doc/images/audiorecorder.png b/examples/multimedia/audiorecorder/doc/images/audiorecorder.png
similarity index 100%
rename from examples/audiorecorder/doc/images/audiorecorder.png
rename to examples/multimedia/audiorecorder/doc/images/audiorecorder.png
diff --git a/examples/audiorecorder/doc/src/audiorecorder.qdoc b/examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc
similarity index 100%
rename from examples/audiorecorder/doc/src/audiorecorder.qdoc
rename to examples/multimedia/audiorecorder/doc/src/audiorecorder.qdoc
diff --git a/examples/audiorecorder/main.cpp b/examples/multimedia/audiorecorder/main.cpp
similarity index 100%
rename from examples/audiorecorder/main.cpp
rename to examples/multimedia/audiorecorder/main.cpp
diff --git a/examples/audiorecorder/qaudiolevel.cpp b/examples/multimedia/audiorecorder/qaudiolevel.cpp
similarity index 100%
rename from examples/audiorecorder/qaudiolevel.cpp
rename to examples/multimedia/audiorecorder/qaudiolevel.cpp
diff --git a/examples/audiorecorder/qaudiolevel.h b/examples/multimedia/audiorecorder/qaudiolevel.h
similarity index 100%
rename from examples/audiorecorder/qaudiolevel.h
rename to 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 0000000000000000000000000000000000000000..68942fa3fb90ab53f34d756d55e7f39cdbf8cee6
--- /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
similarity index 100%
rename from examples/declarative-radio/declarative-radio.qrc
rename to 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
similarity index 100%
rename from examples/declarative-radio/doc/images/declarative-radio-example.png
rename to 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
similarity index 100%
rename from examples/declarative-radio/doc/src/declarative-radio.qdoc
rename to examples/multimedia/declarative-radio/doc/src/declarative-radio.qdoc
diff --git a/examples/declarative-radio/main.cpp b/examples/multimedia/declarative-radio/main.cpp
similarity index 100%
rename from examples/declarative-radio/main.cpp
rename to examples/multimedia/declarative-radio/main.cpp
diff --git a/examples/declarative-radio/view.qml b/examples/multimedia/declarative-radio/view.qml
similarity index 100%
rename from examples/declarative-radio/view.qml
rename to examples/multimedia/declarative-radio/view.qml
diff --git a/examples/multimedia/multimedia.pro b/examples/multimedia/multimedia.pro
new file mode 100644
index 0000000000000000000000000000000000000000..020ddaa9b477bc22f1bd06ae8033f9b02e779af0
--- /dev/null
+++ b/examples/multimedia/multimedia.pro
@@ -0,0 +1,25 @@
+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 \
+
+ QT += widgets
+}
+
+!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
similarity index 100%
rename from examples/radio/main.cpp
rename to examples/multimedia/radio/main.cpp
diff --git a/examples/radio/radio.cpp b/examples/multimedia/radio/radio.cpp
similarity index 100%
rename from examples/radio/radio.cpp
rename to examples/multimedia/radio/radio.cpp
diff --git a/examples/radio/radio.h b/examples/multimedia/radio/radio.h
similarity index 100%
rename from examples/radio/radio.h
rename to examples/multimedia/radio/radio.h
diff --git a/examples/multimedia/radio/radio.pro b/examples/multimedia/radio/radio.pro
new file mode 100644
index 0000000000000000000000000000000000000000..1b1a35b34393010f33634e79c1657ea92fe624a5
--- /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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/Array.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/Array.h
diff --git a/examples/spectrum/3rdparty/fftreal/Array.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/Array.hpp
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/Array.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/Array.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/DynArray.h b/examples/multimedia/spectrum/3rdparty/fftreal/DynArray.h
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/DynArray.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/DynArray.h
diff --git a/examples/spectrum/3rdparty/fftreal/DynArray.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/DynArray.hpp
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/DynArray.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/DynArray.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/FFTReal.dsp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.dsp
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/FFTReal.dsp
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.dsp
diff --git a/examples/spectrum/3rdparty/fftreal/FFTReal.dsw b/examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.dsw
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/FFTReal.dsw
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.dsw
diff --git a/examples/spectrum/3rdparty/fftreal/FFTReal.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.h
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/FFTReal.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.h
diff --git a/examples/spectrum/3rdparty/fftreal/FFTReal.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.hpp
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/FFTReal.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTReal.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealFixLen.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLen.h
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/FFTRealFixLen.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLen.h
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLen.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealFixLenParam.h
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassDirect.h
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassDirect.h
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassDirect.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassInverse.h
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassInverse.h
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealPassInverse.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealSelect.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealSelect.h
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/FFTRealSelect.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealSelect.h
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealSelect.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealSelect.hpp
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/FFTRealSelect.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealSelect.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealUseTrigo.h
diff --git a/examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/FFTRealUseTrigo.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/OscSinCos.h b/examples/multimedia/spectrum/3rdparty/fftreal/OscSinCos.h
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/OscSinCos.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/OscSinCos.h
diff --git a/examples/spectrum/3rdparty/fftreal/OscSinCos.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/OscSinCos.hpp
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/OscSinCos.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/OscSinCos.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/TestAccuracy.h b/examples/multimedia/spectrum/3rdparty/fftreal/TestAccuracy.h
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/TestAccuracy.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/TestAccuracy.h
diff --git a/examples/spectrum/3rdparty/fftreal/TestAccuracy.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/TestAccuracy.hpp
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/TestAccuracy.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/TestAccuracy.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/TestHelperFixLen.h b/examples/multimedia/spectrum/3rdparty/fftreal/TestHelperFixLen.h
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/TestHelperFixLen.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/TestHelperFixLen.h
diff --git a/examples/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/TestHelperFixLen.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/TestHelperNormal.h b/examples/multimedia/spectrum/3rdparty/fftreal/TestHelperNormal.h
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/TestHelperNormal.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/TestHelperNormal.h
diff --git a/examples/spectrum/3rdparty/fftreal/TestHelperNormal.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/TestHelperNormal.hpp
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/TestHelperNormal.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/TestHelperNormal.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/TestSpeed.h b/examples/multimedia/spectrum/3rdparty/fftreal/TestSpeed.h
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/TestSpeed.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/TestSpeed.h
diff --git a/examples/spectrum/3rdparty/fftreal/TestSpeed.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/TestSpeed.hpp
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/TestSpeed.hpp
rename to examples/multimedia/spectrum/3rdparty/fftreal/TestSpeed.hpp
diff --git a/examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h b/examples/multimedia/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h
rename to examples/multimedia/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.h
diff --git a/examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp b/examples/multimedia/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/TestWhiteNoiseGen.hpp
rename to 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/bwins/fftrealu.def
rename to 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/def.h
rename to 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/eabi/fftrealu.def
rename to 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/fftreal.pas
rename to examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pas
diff --git a/examples/spectrum/3rdparty/fftreal/fftreal.pro b/examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro
similarity index 75%
rename from examples/spectrum/3rdparty/fftreal/fftreal.pro
rename to examples/multimedia/spectrum/3rdparty/fftreal/fftreal.pro
index 45a21864c06a7a7c85405e821de13651530c7af0..f6abeeb15d2e6b10c6b65e7774d3aba79516d30a 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp
rename to 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/fftreal_wrapper.h
rename to 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/license.txt
rename to examples/multimedia/spectrum/3rdparty/fftreal/license.txt
diff --git a/examples/spectrum/3rdparty/fftreal/readme.txt b/examples/multimedia/spectrum/3rdparty/fftreal/readme.txt
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/readme.txt
rename to 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp
rename to 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.h
rename to 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.hpp
rename to 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/stopwatch/Int64.h
rename to 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/stopwatch/StopWatch.cpp
rename to 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/stopwatch/StopWatch.h
rename to 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/stopwatch/StopWatch.hpp
rename to 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/stopwatch/def.h
rename to 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/stopwatch/fnc.h
rename to 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/stopwatch/fnc.hpp
rename to 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/test.cpp
rename to 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/test_fnc.h
rename to 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/test_fnc.hpp
rename to 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/test_settings.h
rename to 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
similarity index 100%
rename from examples/spectrum/3rdparty/fftreal/testapp.dpr
rename to examples/multimedia/spectrum/3rdparty/fftreal/testapp.dpr
diff --git a/examples/spectrum/README.txt b/examples/multimedia/spectrum/README.txt
similarity index 100%
rename from examples/spectrum/README.txt
rename to examples/multimedia/spectrum/README.txt
diff --git a/examples/spectrum/TODO.txt b/examples/multimedia/spectrum/TODO.txt
similarity index 100%
rename from examples/spectrum/TODO.txt
rename to examples/multimedia/spectrum/TODO.txt
diff --git a/examples/spectrum/app/.gitignore b/examples/multimedia/spectrum/app/.gitignore
similarity index 100%
rename from examples/spectrum/app/.gitignore
rename to examples/multimedia/spectrum/app/.gitignore
diff --git a/examples/spectrum/app/app.pro b/examples/multimedia/spectrum/app/app.pro
similarity index 87%
rename from examples/spectrum/app/app.pro
rename to examples/multimedia/spectrum/app/app.pro
index 712fafcf0afc1bd658301d098c0f3d81eb77a54f..581848a7fb648db9299851628f4ba530c7ce08ee 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
similarity index 100%
rename from examples/spectrum/app/engine.cpp
rename to examples/multimedia/spectrum/app/engine.cpp
diff --git a/examples/spectrum/app/engine.h b/examples/multimedia/spectrum/app/engine.h
similarity index 100%
rename from examples/spectrum/app/engine.h
rename to examples/multimedia/spectrum/app/engine.h
diff --git a/examples/spectrum/app/frequencyspectrum.cpp b/examples/multimedia/spectrum/app/frequencyspectrum.cpp
similarity index 100%
rename from examples/spectrum/app/frequencyspectrum.cpp
rename to examples/multimedia/spectrum/app/frequencyspectrum.cpp
diff --git a/examples/spectrum/app/frequencyspectrum.h b/examples/multimedia/spectrum/app/frequencyspectrum.h
similarity index 100%
rename from examples/spectrum/app/frequencyspectrum.h
rename to examples/multimedia/spectrum/app/frequencyspectrum.h
diff --git a/examples/spectrum/app/images/record.png b/examples/multimedia/spectrum/app/images/record.png
similarity index 100%
rename from examples/spectrum/app/images/record.png
rename to examples/multimedia/spectrum/app/images/record.png
diff --git a/examples/spectrum/app/images/settings.png b/examples/multimedia/spectrum/app/images/settings.png
similarity index 100%
rename from examples/spectrum/app/images/settings.png
rename to examples/multimedia/spectrum/app/images/settings.png
diff --git a/examples/spectrum/app/levelmeter.cpp b/examples/multimedia/spectrum/app/levelmeter.cpp
similarity index 100%
rename from examples/spectrum/app/levelmeter.cpp
rename to examples/multimedia/spectrum/app/levelmeter.cpp
diff --git a/examples/spectrum/app/levelmeter.h b/examples/multimedia/spectrum/app/levelmeter.h
similarity index 100%
rename from examples/spectrum/app/levelmeter.h
rename to examples/multimedia/spectrum/app/levelmeter.h
diff --git a/examples/spectrum/app/main.cpp b/examples/multimedia/spectrum/app/main.cpp
similarity index 100%
rename from examples/spectrum/app/main.cpp
rename to examples/multimedia/spectrum/app/main.cpp
diff --git a/examples/spectrum/app/mainwidget.cpp b/examples/multimedia/spectrum/app/mainwidget.cpp
similarity index 100%
rename from examples/spectrum/app/mainwidget.cpp
rename to examples/multimedia/spectrum/app/mainwidget.cpp
diff --git a/examples/spectrum/app/mainwidget.h b/examples/multimedia/spectrum/app/mainwidget.h
similarity index 100%
rename from examples/spectrum/app/mainwidget.h
rename to examples/multimedia/spectrum/app/mainwidget.h
diff --git a/examples/spectrum/app/progressbar.cpp b/examples/multimedia/spectrum/app/progressbar.cpp
similarity index 100%
rename from examples/spectrum/app/progressbar.cpp
rename to examples/multimedia/spectrum/app/progressbar.cpp
diff --git a/examples/spectrum/app/progressbar.h b/examples/multimedia/spectrum/app/progressbar.h
similarity index 100%
rename from examples/spectrum/app/progressbar.h
rename to examples/multimedia/spectrum/app/progressbar.h
diff --git a/examples/spectrum/app/settingsdialog.cpp b/examples/multimedia/spectrum/app/settingsdialog.cpp
similarity index 100%
rename from examples/spectrum/app/settingsdialog.cpp
rename to examples/multimedia/spectrum/app/settingsdialog.cpp
diff --git a/examples/spectrum/app/settingsdialog.h b/examples/multimedia/spectrum/app/settingsdialog.h
similarity index 100%
rename from examples/spectrum/app/settingsdialog.h
rename to examples/multimedia/spectrum/app/settingsdialog.h
diff --git a/examples/spectrum/app/spectrograph.cpp b/examples/multimedia/spectrum/app/spectrograph.cpp
similarity index 100%
rename from examples/spectrum/app/spectrograph.cpp
rename to examples/multimedia/spectrum/app/spectrograph.cpp
diff --git a/examples/spectrum/app/spectrograph.h b/examples/multimedia/spectrum/app/spectrograph.h
similarity index 100%
rename from examples/spectrum/app/spectrograph.h
rename to examples/multimedia/spectrum/app/spectrograph.h
diff --git a/examples/spectrum/app/spectrum.h b/examples/multimedia/spectrum/app/spectrum.h
similarity index 100%
rename from examples/spectrum/app/spectrum.h
rename to examples/multimedia/spectrum/app/spectrum.h
diff --git a/examples/spectrum/app/spectrum.qrc b/examples/multimedia/spectrum/app/spectrum.qrc
similarity index 100%
rename from examples/spectrum/app/spectrum.qrc
rename to examples/multimedia/spectrum/app/spectrum.qrc
diff --git a/examples/spectrum/app/spectrumanalyser.cpp b/examples/multimedia/spectrum/app/spectrumanalyser.cpp
similarity index 100%
rename from examples/spectrum/app/spectrumanalyser.cpp
rename to examples/multimedia/spectrum/app/spectrumanalyser.cpp
diff --git a/examples/spectrum/app/spectrumanalyser.h b/examples/multimedia/spectrum/app/spectrumanalyser.h
similarity index 100%
rename from examples/spectrum/app/spectrumanalyser.h
rename to examples/multimedia/spectrum/app/spectrumanalyser.h
diff --git a/examples/spectrum/app/tonegenerator.cpp b/examples/multimedia/spectrum/app/tonegenerator.cpp
similarity index 100%
rename from examples/spectrum/app/tonegenerator.cpp
rename to examples/multimedia/spectrum/app/tonegenerator.cpp
diff --git a/examples/spectrum/app/tonegenerator.h b/examples/multimedia/spectrum/app/tonegenerator.h
similarity index 100%
rename from examples/spectrum/app/tonegenerator.h
rename to examples/multimedia/spectrum/app/tonegenerator.h
diff --git a/examples/spectrum/app/tonegeneratordialog.cpp b/examples/multimedia/spectrum/app/tonegeneratordialog.cpp
similarity index 100%
rename from examples/spectrum/app/tonegeneratordialog.cpp
rename to examples/multimedia/spectrum/app/tonegeneratordialog.cpp
diff --git a/examples/spectrum/app/tonegeneratordialog.h b/examples/multimedia/spectrum/app/tonegeneratordialog.h
similarity index 100%
rename from examples/spectrum/app/tonegeneratordialog.h
rename to examples/multimedia/spectrum/app/tonegeneratordialog.h
diff --git a/examples/spectrum/app/utils.cpp b/examples/multimedia/spectrum/app/utils.cpp
similarity index 100%
rename from examples/spectrum/app/utils.cpp
rename to examples/multimedia/spectrum/app/utils.cpp
diff --git a/examples/spectrum/app/utils.h b/examples/multimedia/spectrum/app/utils.h
similarity index 100%
rename from examples/spectrum/app/utils.h
rename to examples/multimedia/spectrum/app/utils.h
diff --git a/examples/spectrum/app/waveform.cpp b/examples/multimedia/spectrum/app/waveform.cpp
similarity index 100%
rename from examples/spectrum/app/waveform.cpp
rename to examples/multimedia/spectrum/app/waveform.cpp
diff --git a/examples/spectrum/app/waveform.h b/examples/multimedia/spectrum/app/waveform.h
similarity index 100%
rename from examples/spectrum/app/waveform.h
rename to examples/multimedia/spectrum/app/waveform.h
diff --git a/examples/spectrum/app/wavfile.cpp b/examples/multimedia/spectrum/app/wavfile.cpp
similarity index 100%
rename from examples/spectrum/app/wavfile.cpp
rename to examples/multimedia/spectrum/app/wavfile.cpp
diff --git a/examples/spectrum/app/wavfile.h b/examples/multimedia/spectrum/app/wavfile.h
similarity index 100%
rename from examples/spectrum/app/wavfile.h
rename to 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
similarity index 100%
rename from examples/spectrum/doc/images/spectrum-demo.png
rename to 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
similarity index 100%
rename from examples/spectrum/doc/src/spectrum.qdoc
rename to examples/multimedia/spectrum/doc/src/spectrum.qdoc
diff --git a/examples/spectrum/spectrum.pri b/examples/multimedia/spectrum/spectrum.pri
similarity index 100%
rename from examples/spectrum/spectrum.pri
rename to examples/multimedia/spectrum/spectrum.pri
diff --git a/examples/spectrum/spectrum.pro b/examples/multimedia/spectrum/spectrum.pro
similarity index 60%
rename from examples/spectrum/spectrum.pro
rename to examples/multimedia/spectrum/spectrum.pro
index 0dbb77108863edb3cafb87d117f56cd336ead37c..164ab69b0b6c2827fc310ea57c41e4f105ad1c26 100644
--- a/examples/spectrum/spectrum.pro
+++ b/examples/multimedia/spectrum/spectrum.pro
@@ -11,6 +11,3 @@ 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
similarity index 100%
rename from examples/video/doc/images/qmlvideo-menu.png
rename to 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
similarity index 100%
rename from examples/video/doc/images/qmlvideo-overlay.png
rename to 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
similarity index 100%
rename from examples/video/doc/images/qmlvideofx-camera-glow.png
rename to 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
similarity index 100%
rename from examples/video/doc/images/qmlvideofx-camera-magnify.png
rename to 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
similarity index 100%
rename from examples/video/doc/images/qmlvideofx-effects-menu.png
rename to 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
similarity index 100%
rename from examples/video/doc/images/qmlvideofx-source-menu.png
rename to 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
similarity index 100%
rename from examples/video/doc/images/qmlvideofx-video-edgedetection.png
rename to 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
similarity index 100%
rename from examples/video/doc/images/qmlvideofx-video-pagecurl.png
rename to examples/multimedia/video/doc/images/qmlvideofx-video-pagecurl.png
diff --git a/examples/video/doc/images/video-qml-paint-rate.png b/examples/multimedia/video/doc/images/video-qml-paint-rate.png
similarity index 100%
rename from examples/video/doc/images/video-qml-paint-rate.png
rename to examples/multimedia/video/doc/images/video-qml-paint-rate.png
diff --git a/examples/video/doc/src/qmlvideo.qdoc b/examples/multimedia/video/doc/src/qmlvideo.qdoc
similarity index 100%
rename from examples/video/doc/src/qmlvideo.qdoc
rename to examples/multimedia/video/doc/src/qmlvideo.qdoc
diff --git a/examples/video/doc/src/qmlvideofx.qdoc b/examples/multimedia/video/doc/src/qmlvideofx.qdoc
similarity index 100%
rename from examples/video/doc/src/qmlvideofx.qdoc
rename to examples/multimedia/video/doc/src/qmlvideofx.qdoc
diff --git a/examples/video/doc/src/video-qml-paint-rate.qdocinc b/examples/multimedia/video/doc/src/video-qml-paint-rate.qdocinc
similarity index 100%
rename from examples/video/doc/src/video-qml-paint-rate.qdocinc
rename to examples/multimedia/video/doc/src/video-qml-paint-rate.qdocinc
diff --git a/examples/video/qmlvideo/images/close.png b/examples/multimedia/video/qmlvideo/images/close.png
similarity index 100%
rename from examples/video/qmlvideo/images/close.png
rename to examples/multimedia/video/qmlvideo/images/close.png
diff --git a/examples/video/qmlvideo/images/folder.png b/examples/multimedia/video/qmlvideo/images/folder.png
similarity index 100%
rename from examples/video/qmlvideo/images/folder.png
rename to examples/multimedia/video/qmlvideo/images/folder.png
diff --git a/examples/video/qmlvideo/images/leaves.jpg b/examples/multimedia/video/qmlvideo/images/leaves.jpg
similarity index 100%
rename from examples/video/qmlvideo/images/leaves.jpg
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/images/progress_handle.svg
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/images/progress_handle_pressed.svg
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/images/titlebar.png
rename to examples/multimedia/video/qmlvideo/images/titlebar.png
diff --git a/examples/video/qmlvideo/images/titlebar.sci b/examples/multimedia/video/qmlvideo/images/titlebar.sci
similarity index 100%
rename from examples/video/qmlvideo/images/titlebar.sci
rename to examples/multimedia/video/qmlvideo/images/titlebar.sci
diff --git a/examples/video/qmlvideo/images/up.png b/examples/multimedia/video/qmlvideo/images/up.png
similarity index 100%
rename from examples/video/qmlvideo/images/up.png
rename to examples/multimedia/video/qmlvideo/images/up.png
diff --git a/examples/video/qmlvideo/main.cpp b/examples/multimedia/video/qmlvideo/main.cpp
similarity index 100%
rename from examples/video/qmlvideo/main.cpp
rename to examples/multimedia/video/qmlvideo/main.cpp
diff --git a/examples/video/qmlvideo/qml/qmlvideo/Button.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Button.qml
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/Button.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/CameraBasic.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/CameraDrag.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/CameraDummy.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/CameraFullScreen.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/CameraFullScreenInverted.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/CameraItem.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/CameraMove.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/CameraOverlay.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/CameraResize.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/CameraRotate.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/CameraSpin.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/Content.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/FileBrowser.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/Scene.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/SceneBasic.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/SceneDrag.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/SceneMove.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/SceneMulti.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/SceneResize.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/SceneRotate.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/SceneSpin.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/SeekControl.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/VideoBasic.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/VideoDrag.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/VideoDummy.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/VideoFullScreen.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/VideoFullScreenInverted.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/VideoItem.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/VideoMove.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/VideoOverlay.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/VideoResize.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/VideoRotate.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/VideoSeek.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/VideoSpin.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideo/qml/qmlvideo/main.qml
rename to examples/multimedia/video/qmlvideo/qml/qmlvideo/main.qml
diff --git a/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp
similarity index 100%
rename from examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp
rename to examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp
diff --git a/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.h b/examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.h
similarity index 100%
rename from examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.h
rename to examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.h
diff --git a/examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri b/examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri
similarity index 100%
rename from examples/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri
rename to examples/multimedia/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri
diff --git a/examples/video/qmlvideo/qmlvideo.png b/examples/multimedia/video/qmlvideo/qmlvideo.png
similarity index 100%
rename from examples/video/qmlvideo/qmlvideo.png
rename to examples/multimedia/video/qmlvideo/qmlvideo.png
diff --git a/examples/video/qmlvideo/qmlvideo.pro b/examples/multimedia/video/qmlvideo/qmlvideo.pro
similarity index 52%
rename from examples/video/qmlvideo/qmlvideo.pro
rename to examples/multimedia/video/qmlvideo/qmlvideo.pro
index 737d04046949289a8d9e32b95855172084e5a439..78c6f05405a32f21feedf915c0ae1771a4360e2c 100644
--- a/examples/video/qmlvideo/qmlvideo.pro
+++ b/examples/multimedia/video/qmlvideo/qmlvideo.pro
@@ -13,9 +13,6 @@ 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
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/video/qmlvideo
+INSTALLS += target
diff --git a/examples/video/qmlvideo/qmlvideo.qrc b/examples/multimedia/video/qmlvideo/qmlvideo.qrc
similarity index 100%
rename from examples/video/qmlvideo/qmlvideo.qrc
rename to examples/multimedia/video/qmlvideo/qmlvideo.qrc
diff --git a/examples/video/qmlvideo/qmlvideo.svg b/examples/multimedia/video/qmlvideo/qmlvideo.svg
similarity index 100%
rename from examples/video/qmlvideo/qmlvideo.svg
rename to examples/multimedia/video/qmlvideo/qmlvideo.svg
diff --git a/examples/video/qmlvideo/trace.h b/examples/multimedia/video/qmlvideo/trace.h
similarity index 100%
rename from examples/video/qmlvideo/trace.h
rename to examples/multimedia/video/qmlvideo/trace.h
diff --git a/examples/video/qmlvideofx/filereader.cpp b/examples/multimedia/video/qmlvideofx/filereader.cpp
similarity index 100%
rename from examples/video/qmlvideofx/filereader.cpp
rename to examples/multimedia/video/qmlvideofx/filereader.cpp
diff --git a/examples/video/qmlvideofx/filereader.h b/examples/multimedia/video/qmlvideofx/filereader.h
similarity index 100%
rename from examples/video/qmlvideofx/filereader.h
rename to examples/multimedia/video/qmlvideofx/filereader.h
diff --git a/examples/video/qmlvideofx/images/close.png b/examples/multimedia/video/qmlvideofx/images/close.png
similarity index 100%
rename from examples/video/qmlvideofx/images/close.png
rename to examples/multimedia/video/qmlvideofx/images/close.png
diff --git a/examples/video/qmlvideofx/images/folder.png b/examples/multimedia/video/qmlvideofx/images/folder.png
similarity index 100%
rename from examples/video/qmlvideofx/images/folder.png
rename to 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
similarity index 100%
rename from examples/video/qmlvideofx/images/qt-logo.png
rename to 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
similarity index 100%
rename from examples/video/qmlvideofx/images/titlebar.png
rename to examples/multimedia/video/qmlvideofx/images/titlebar.png
diff --git a/examples/video/qmlvideofx/images/titlebar.sci b/examples/multimedia/video/qmlvideofx/images/titlebar.sci
similarity index 100%
rename from examples/video/qmlvideofx/images/titlebar.sci
rename to examples/multimedia/video/qmlvideofx/images/titlebar.sci
diff --git a/examples/video/qmlvideofx/images/up.png b/examples/multimedia/video/qmlvideofx/images/up.png
similarity index 100%
rename from examples/video/qmlvideofx/images/up.png
rename to examples/multimedia/video/qmlvideofx/images/up.png
diff --git a/examples/video/qmlvideofx/main.cpp b/examples/multimedia/video/qmlvideofx/main.cpp
similarity index 100%
rename from examples/video/qmlvideofx/main.cpp
rename to examples/multimedia/video/qmlvideofx/main.cpp
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/Button.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Button.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/Button.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/Content.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/ContentImage.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/Divider.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/Effect.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Effect.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml
diff --git a/examples/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/HintedMouseArea.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/Slider.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/main-largescreen.qml
rename to 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
similarity index 100%
rename from examples/video/qmlvideofx/qml/qmlvideofx/main-smallscreen.qml
rename to examples/multimedia/video/qmlvideofx/qml/qmlvideofx/main-smallscreen.qml
diff --git a/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp
similarity index 100%
rename from examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp
rename to examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp
diff --git a/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.h b/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.h
similarity index 100%
rename from examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.h
rename to examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.h
diff --git a/examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri b/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri
similarity index 100%
rename from examples/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri
rename to examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri
diff --git a/examples/video/qmlvideofx/qmlvideofx.png b/examples/multimedia/video/qmlvideofx/qmlvideofx.png
similarity index 100%
rename from examples/video/qmlvideofx/qmlvideofx.png
rename to examples/multimedia/video/qmlvideofx/qmlvideofx.png
diff --git a/examples/video/qmlvideofx/qmlvideofx.pro b/examples/multimedia/video/qmlvideofx/qmlvideofx.pro
similarity index 58%
rename from examples/video/qmlvideofx/qmlvideofx.pro
rename to examples/multimedia/video/qmlvideofx/qmlvideofx.pro
index d556fd77c8b6cb7c7d1f30e24574c033d1008311..7779565f5dd299a398677cffcf7c44ee2a1a809a 100644
--- a/examples/video/qmlvideofx/qmlvideofx.pro
+++ b/examples/multimedia/video/qmlvideofx/qmlvideofx.pro
@@ -19,8 +19,5 @@ maemo6: {
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
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/video/qmlvideofx
+INSTALLS += target
diff --git a/examples/video/qmlvideofx/qmlvideofx.qrc b/examples/multimedia/video/qmlvideofx/qmlvideofx.qrc
similarity index 100%
rename from examples/video/qmlvideofx/qmlvideofx.qrc
rename to examples/multimedia/video/qmlvideofx/qmlvideofx.qrc
diff --git a/examples/video/qmlvideofx/qmlvideofx.svg b/examples/multimedia/video/qmlvideofx/qmlvideofx.svg
similarity index 100%
rename from examples/video/qmlvideofx/qmlvideofx.svg
rename to examples/multimedia/video/qmlvideofx/qmlvideofx.svg
diff --git a/examples/video/qmlvideofx/shaders/billboard.fsh b/examples/multimedia/video/qmlvideofx/shaders/billboard.fsh
similarity index 100%
rename from examples/video/qmlvideofx/shaders/billboard.fsh
rename to examples/multimedia/video/qmlvideofx/shaders/billboard.fsh
diff --git a/examples/video/qmlvideofx/shaders/blackandwhite.fsh b/examples/multimedia/video/qmlvideofx/shaders/blackandwhite.fsh
similarity index 100%
rename from examples/video/qmlvideofx/shaders/blackandwhite.fsh
rename to examples/multimedia/video/qmlvideofx/shaders/blackandwhite.fsh
diff --git a/examples/video/qmlvideofx/shaders/emboss.fsh b/examples/multimedia/video/qmlvideofx/shaders/emboss.fsh
similarity index 100%
rename from examples/video/qmlvideofx/shaders/emboss.fsh
rename to 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
similarity index 100%
rename from examples/video/qmlvideofx/shaders/gaussianblur_h.fsh
rename to 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
similarity index 100%
rename from examples/video/qmlvideofx/shaders/gaussianblur_v.fsh
rename to 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
similarity index 100%
rename from examples/video/qmlvideofx/shaders/glow.fsh
rename to examples/multimedia/video/qmlvideofx/shaders/glow.fsh
diff --git a/examples/video/qmlvideofx/shaders/isolate.fsh b/examples/multimedia/video/qmlvideofx/shaders/isolate.fsh
similarity index 100%
rename from examples/video/qmlvideofx/shaders/isolate.fsh
rename to examples/multimedia/video/qmlvideofx/shaders/isolate.fsh
diff --git a/examples/video/qmlvideofx/shaders/magnify.fsh b/examples/multimedia/video/qmlvideofx/shaders/magnify.fsh
similarity index 100%
rename from examples/video/qmlvideofx/shaders/magnify.fsh
rename to examples/multimedia/video/qmlvideofx/shaders/magnify.fsh
diff --git a/examples/video/qmlvideofx/shaders/pagecurl.fsh b/examples/multimedia/video/qmlvideofx/shaders/pagecurl.fsh
similarity index 100%
rename from examples/video/qmlvideofx/shaders/pagecurl.fsh
rename to examples/multimedia/video/qmlvideofx/shaders/pagecurl.fsh
diff --git a/examples/video/qmlvideofx/shaders/pixelate.fsh b/examples/multimedia/video/qmlvideofx/shaders/pixelate.fsh
similarity index 100%
rename from examples/video/qmlvideofx/shaders/pixelate.fsh
rename to examples/multimedia/video/qmlvideofx/shaders/pixelate.fsh
diff --git a/examples/video/qmlvideofx/shaders/posterize.fsh b/examples/multimedia/video/qmlvideofx/shaders/posterize.fsh
similarity index 100%
rename from examples/video/qmlvideofx/shaders/posterize.fsh
rename to examples/multimedia/video/qmlvideofx/shaders/posterize.fsh
diff --git a/examples/video/qmlvideofx/shaders/ripple.fsh b/examples/multimedia/video/qmlvideofx/shaders/ripple.fsh
similarity index 100%
rename from examples/video/qmlvideofx/shaders/ripple.fsh
rename to examples/multimedia/video/qmlvideofx/shaders/ripple.fsh
diff --git a/examples/video/qmlvideofx/shaders/selectionpanel.fsh b/examples/multimedia/video/qmlvideofx/shaders/selectionpanel.fsh
similarity index 100%
rename from examples/video/qmlvideofx/shaders/selectionpanel.fsh
rename to examples/multimedia/video/qmlvideofx/shaders/selectionpanel.fsh
diff --git a/examples/video/qmlvideofx/shaders/sepia.fsh b/examples/multimedia/video/qmlvideofx/shaders/sepia.fsh
similarity index 100%
rename from examples/video/qmlvideofx/shaders/sepia.fsh
rename to examples/multimedia/video/qmlvideofx/shaders/sepia.fsh
diff --git a/examples/video/qmlvideofx/shaders/sharpen.fsh b/examples/multimedia/video/qmlvideofx/shaders/sharpen.fsh
similarity index 100%
rename from examples/video/qmlvideofx/shaders/sharpen.fsh
rename to examples/multimedia/video/qmlvideofx/shaders/sharpen.fsh
diff --git a/examples/video/qmlvideofx/shaders/shockwave.fsh b/examples/multimedia/video/qmlvideofx/shaders/shockwave.fsh
similarity index 100%
rename from examples/video/qmlvideofx/shaders/shockwave.fsh
rename to examples/multimedia/video/qmlvideofx/shaders/shockwave.fsh
diff --git a/examples/video/qmlvideofx/shaders/sobeledgedetection1.fsh b/examples/multimedia/video/qmlvideofx/shaders/sobeledgedetection1.fsh
similarity index 100%
rename from examples/video/qmlvideofx/shaders/sobeledgedetection1.fsh
rename to examples/multimedia/video/qmlvideofx/shaders/sobeledgedetection1.fsh
diff --git a/examples/video/qmlvideofx/shaders/sobeledgedetection2.fsh b/examples/multimedia/video/qmlvideofx/shaders/sobeledgedetection2.fsh
similarity index 100%
rename from examples/video/qmlvideofx/shaders/sobeledgedetection2.fsh
rename to examples/multimedia/video/qmlvideofx/shaders/sobeledgedetection2.fsh
diff --git a/examples/video/qmlvideofx/shaders/tiltshift.fsh b/examples/multimedia/video/qmlvideofx/shaders/tiltshift.fsh
similarity index 100%
rename from examples/video/qmlvideofx/shaders/tiltshift.fsh
rename to examples/multimedia/video/qmlvideofx/shaders/tiltshift.fsh
diff --git a/examples/video/qmlvideofx/shaders/toon.fsh b/examples/multimedia/video/qmlvideofx/shaders/toon.fsh
similarity index 100%
rename from examples/video/qmlvideofx/shaders/toon.fsh
rename to examples/multimedia/video/qmlvideofx/shaders/toon.fsh
diff --git a/examples/video/qmlvideofx/shaders/vignette.fsh b/examples/multimedia/video/qmlvideofx/shaders/vignette.fsh
similarity index 100%
rename from examples/video/qmlvideofx/shaders/vignette.fsh
rename to examples/multimedia/video/qmlvideofx/shaders/vignette.fsh
diff --git a/examples/video/qmlvideofx/shaders/warhol.fsh b/examples/multimedia/video/qmlvideofx/shaders/warhol.fsh
similarity index 100%
rename from examples/video/qmlvideofx/shaders/warhol.fsh
rename to examples/multimedia/video/qmlvideofx/shaders/warhol.fsh
diff --git a/examples/video/qmlvideofx/shaders/wobble.fsh b/examples/multimedia/video/qmlvideofx/shaders/wobble.fsh
similarity index 100%
rename from examples/video/qmlvideofx/shaders/wobble.fsh
rename to examples/multimedia/video/qmlvideofx/shaders/wobble.fsh
diff --git a/examples/video/qmlvideofx/trace.h b/examples/multimedia/video/qmlvideofx/trace.h
similarity index 100%
rename from examples/video/qmlvideofx/trace.h
rename to examples/multimedia/video/qmlvideofx/trace.h
diff --git a/examples/video/snippets/frequencymonitor/frequencymonitor.cpp b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.cpp
similarity index 100%
rename from examples/video/snippets/frequencymonitor/frequencymonitor.cpp
rename to examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.cpp
diff --git a/examples/video/snippets/frequencymonitor/frequencymonitor.h b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.h
similarity index 100%
rename from examples/video/snippets/frequencymonitor/frequencymonitor.h
rename to examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.h
diff --git a/examples/video/snippets/frequencymonitor/frequencymonitor.pri b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.pri
similarity index 100%
rename from examples/video/snippets/frequencymonitor/frequencymonitor.pri
rename to examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.pri
diff --git a/examples/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp
similarity index 100%
rename from examples/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp
rename to examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp
diff --git a/examples/video/snippets/frequencymonitor/frequencymonitordeclarative.pri b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.pri
similarity index 100%
rename from examples/video/snippets/frequencymonitor/frequencymonitordeclarative.pri
rename to examples/multimedia/video/snippets/frequencymonitor/frequencymonitordeclarative.pri
diff --git a/examples/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml b/examples/multimedia/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml
similarity index 100%
rename from examples/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml
rename to examples/multimedia/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml
diff --git a/examples/video/snippets/performancemonitor/performancemonitor.cpp b/examples/multimedia/video/snippets/performancemonitor/performancemonitor.cpp
similarity index 100%
rename from examples/video/snippets/performancemonitor/performancemonitor.cpp
rename to examples/multimedia/video/snippets/performancemonitor/performancemonitor.cpp
diff --git a/examples/video/snippets/performancemonitor/performancemonitor.h b/examples/multimedia/video/snippets/performancemonitor/performancemonitor.h
similarity index 100%
rename from examples/video/snippets/performancemonitor/performancemonitor.h
rename to examples/multimedia/video/snippets/performancemonitor/performancemonitor.h
diff --git a/examples/video/snippets/performancemonitor/performancemonitor.pri b/examples/multimedia/video/snippets/performancemonitor/performancemonitor.pri
similarity index 100%
rename from examples/video/snippets/performancemonitor/performancemonitor.pri
rename to examples/multimedia/video/snippets/performancemonitor/performancemonitor.pri
diff --git a/examples/video/snippets/performancemonitor/performancemonitordeclarative.cpp b/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.cpp
similarity index 100%
rename from examples/video/snippets/performancemonitor/performancemonitordeclarative.cpp
rename to examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.cpp
diff --git a/examples/video/snippets/performancemonitor/performancemonitordeclarative.h b/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.h
similarity index 100%
rename from examples/video/snippets/performancemonitor/performancemonitordeclarative.h
rename to examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.h
diff --git a/examples/video/snippets/performancemonitor/performancemonitordeclarative.pri b/examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.pri
similarity index 100%
rename from examples/video/snippets/performancemonitor/performancemonitordeclarative.pri
rename to examples/multimedia/video/snippets/performancemonitor/performancemonitordeclarative.pri
diff --git a/examples/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml b/examples/multimedia/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml
similarity index 100%
rename from examples/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml
rename to 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 0000000000000000000000000000000000000000..3127a4e49dc2f9d9dafa4c01d58e59186e32e747
--- /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
similarity index 100%
rename from examples/camera/camera.cpp
rename to examples/multimediawidgets/camera/camera.cpp
diff --git a/examples/camera/camera.h b/examples/multimediawidgets/camera/camera.h
similarity index 100%
rename from examples/camera/camera.h
rename to examples/multimediawidgets/camera/camera.h
diff --git a/examples/camera/camera.pro b/examples/multimediawidgets/camera/camera.pro
similarity index 60%
rename from examples/camera/camera.pro
rename to examples/multimediawidgets/camera/camera.pro
index f7dd8b787e84f4dcd805419baf3207be3f90e96f..fe8f393855be4e167bdc33d9aaf58f540ff3530d 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
similarity index 100%
rename from examples/camera/camera.ui
rename to examples/multimediawidgets/camera/camera.ui
diff --git a/examples/camera/doc/images/camera-example.png b/examples/multimediawidgets/camera/doc/images/camera-example.png
similarity index 100%
rename from examples/camera/doc/images/camera-example.png
rename to 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
similarity index 100%
rename from examples/camera/doc/src/camera.qdoc
rename to examples/multimediawidgets/camera/doc/src/camera.qdoc
diff --git a/examples/camera/imagesettings.cpp b/examples/multimediawidgets/camera/imagesettings.cpp
similarity index 100%
rename from examples/camera/imagesettings.cpp
rename to examples/multimediawidgets/camera/imagesettings.cpp
diff --git a/examples/camera/imagesettings.h b/examples/multimediawidgets/camera/imagesettings.h
similarity index 100%
rename from examples/camera/imagesettings.h
rename to examples/multimediawidgets/camera/imagesettings.h
diff --git a/examples/camera/imagesettings.ui b/examples/multimediawidgets/camera/imagesettings.ui
similarity index 100%
rename from examples/camera/imagesettings.ui
rename to examples/multimediawidgets/camera/imagesettings.ui
diff --git a/examples/camera/main.cpp b/examples/multimediawidgets/camera/main.cpp
similarity index 100%
rename from examples/camera/main.cpp
rename to examples/multimediawidgets/camera/main.cpp
diff --git a/examples/camera/videosettings.cpp b/examples/multimediawidgets/camera/videosettings.cpp
similarity index 100%
rename from examples/camera/videosettings.cpp
rename to examples/multimediawidgets/camera/videosettings.cpp
diff --git a/examples/camera/videosettings.h b/examples/multimediawidgets/camera/videosettings.h
similarity index 100%
rename from examples/camera/videosettings.h
rename to examples/multimediawidgets/camera/videosettings.h
diff --git a/examples/camera/videosettings.ui b/examples/multimediawidgets/camera/videosettings.ui
similarity index 100%
rename from examples/camera/videosettings.ui
rename to examples/multimediawidgets/camera/videosettings.ui
diff --git a/examples/customvideosurface/customvideoitem/customvideoitem.pro b/examples/multimediawidgets/customvideosurface/customvideoitem/customvideoitem.pro
similarity index 50%
rename from examples/customvideosurface/customvideoitem/customvideoitem.pro
rename to examples/multimediawidgets/customvideosurface/customvideoitem/customvideoitem.pro
index 705038985f0964b8be00cfaea704b194a9262919..387e494c9970bfc91898964beeaa9391c12eaa1c 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
similarity index 100%
rename from examples/customvideosurface/customvideoitem/main.cpp
rename to examples/multimediawidgets/customvideosurface/customvideoitem/main.cpp
diff --git a/examples/customvideosurface/customvideoitem/videoitem.cpp b/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.cpp
similarity index 100%
rename from examples/customvideosurface/customvideoitem/videoitem.cpp
rename to examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.cpp
diff --git a/examples/customvideosurface/customvideoitem/videoitem.h b/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.h
similarity index 100%
rename from examples/customvideosurface/customvideoitem/videoitem.h
rename to examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.h
diff --git a/examples/customvideosurface/customvideoitem/videoplayer.cpp b/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.cpp
similarity index 100%
rename from examples/customvideosurface/customvideoitem/videoplayer.cpp
rename to examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.cpp
diff --git a/examples/customvideosurface/customvideoitem/videoplayer.h b/examples/multimediawidgets/customvideosurface/customvideoitem/videoplayer.h
similarity index 100%
rename from examples/customvideosurface/customvideoitem/videoplayer.h
rename to 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 0000000000000000000000000000000000000000..baffdaba7b8b96221a870ccc962f0b8b3b6806b6
--- /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 0000000000000000000000000000000000000000..b4476dfb7f9094450599c601774e78d12b9ddfe2
--- /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
similarity index 100%
rename from examples/customvideosurface/customvideowidget/main.cpp
rename to examples/multimediawidgets/customvideosurface/customvideowidget/main.cpp
diff --git a/examples/customvideosurface/customvideowidget/videoplayer.cpp b/examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.cpp
similarity index 100%
rename from examples/customvideosurface/customvideowidget/videoplayer.cpp
rename to examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.cpp
diff --git a/examples/customvideosurface/customvideowidget/videoplayer.h b/examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.h
similarity index 100%
rename from examples/customvideosurface/customvideowidget/videoplayer.h
rename to examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.h
diff --git a/examples/customvideosurface/customvideowidget/videowidget.cpp b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp
similarity index 100%
rename from examples/customvideosurface/customvideowidget/videowidget.cpp
rename to examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp
diff --git a/examples/customvideosurface/customvideowidget/videowidget.h b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.h
similarity index 100%
rename from examples/customvideosurface/customvideowidget/videowidget.h
rename to examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.h
diff --git a/examples/customvideosurface/customvideowidget/videowidgetsurface.cpp b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.cpp
similarity index 100%
rename from examples/customvideosurface/customvideowidget/videowidgetsurface.cpp
rename to examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.cpp
diff --git a/examples/customvideosurface/customvideowidget/videowidgetsurface.h b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.h
similarity index 100%
rename from examples/customvideosurface/customvideowidget/videowidgetsurface.h
rename to examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.h
diff --git a/examples/declarative-camera/CameraButton.qml b/examples/multimediawidgets/declarative-camera/CameraButton.qml
similarity index 100%
rename from examples/declarative-camera/CameraButton.qml
rename to examples/multimediawidgets/declarative-camera/CameraButton.qml
diff --git a/examples/declarative-camera/CameraPropertyButton.qml b/examples/multimediawidgets/declarative-camera/CameraPropertyButton.qml
similarity index 100%
rename from examples/declarative-camera/CameraPropertyButton.qml
rename to examples/multimediawidgets/declarative-camera/CameraPropertyButton.qml
diff --git a/examples/declarative-camera/CameraPropertyPopup.qml b/examples/multimediawidgets/declarative-camera/CameraPropertyPopup.qml
similarity index 100%
rename from examples/declarative-camera/CameraPropertyPopup.qml
rename to examples/multimediawidgets/declarative-camera/CameraPropertyPopup.qml
diff --git a/examples/declarative-camera/FocusButton.qml b/examples/multimediawidgets/declarative-camera/FocusButton.qml
similarity index 100%
rename from examples/declarative-camera/FocusButton.qml
rename to examples/multimediawidgets/declarative-camera/FocusButton.qml
diff --git a/examples/declarative-camera/PhotoCaptureControls.qml b/examples/multimediawidgets/declarative-camera/PhotoCaptureControls.qml
similarity index 100%
rename from examples/declarative-camera/PhotoCaptureControls.qml
rename to examples/multimediawidgets/declarative-camera/PhotoCaptureControls.qml
diff --git a/examples/declarative-camera/PhotoPreview.qml b/examples/multimediawidgets/declarative-camera/PhotoPreview.qml
similarity index 100%
rename from examples/declarative-camera/PhotoPreview.qml
rename to examples/multimediawidgets/declarative-camera/PhotoPreview.qml
diff --git a/examples/declarative-camera/VideoCaptureControls.qml b/examples/multimediawidgets/declarative-camera/VideoCaptureControls.qml
similarity index 100%
rename from examples/declarative-camera/VideoCaptureControls.qml
rename to examples/multimediawidgets/declarative-camera/VideoCaptureControls.qml
diff --git a/examples/declarative-camera/VideoPreview.qml b/examples/multimediawidgets/declarative-camera/VideoPreview.qml
similarity index 100%
rename from examples/declarative-camera/VideoPreview.qml
rename to examples/multimediawidgets/declarative-camera/VideoPreview.qml
diff --git a/examples/declarative-camera/ZoomControl.qml b/examples/multimediawidgets/declarative-camera/ZoomControl.qml
similarity index 100%
rename from examples/declarative-camera/ZoomControl.qml
rename to 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 0000000000000000000000000000000000000000..c52a1d1e6fd2d048124f749cb39ed53cd9ba9c99
--- /dev/null
+++ b/examples/multimediawidgets/declarative-camera/declarative-camera.pro
@@ -0,0 +1,10 @@
+TEMPLATE=app
+TARGET=declarative-camera
+
+QT += quick qml multimedia
+
+SOURCES += qmlcamera.cpp
+
+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
similarity index 100%
rename from examples/declarative-camera/declarative-camera.qml
rename to examples/multimediawidgets/declarative-camera/declarative-camera.qml
diff --git a/examples/declarative-camera/declarative-camera.qmlproject b/examples/multimediawidgets/declarative-camera/declarative-camera.qmlproject
similarity index 100%
rename from examples/declarative-camera/declarative-camera.qmlproject
rename to examples/multimediawidgets/declarative-camera/declarative-camera.qmlproject
diff --git a/examples/declarative-camera/doc/images/qml-camera.png b/examples/multimediawidgets/declarative-camera/doc/images/qml-camera.png
similarity index 100%
rename from examples/declarative-camera/doc/images/qml-camera.png
rename to 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
similarity index 100%
rename from examples/declarative-camera/doc/src/declarative-camera.qdoc
rename to examples/multimediawidgets/declarative-camera/doc/src/declarative-camera.qdoc
diff --git a/examples/declarative-camera/images/camera_auto_mode.png b/examples/multimediawidgets/declarative-camera/images/camera_auto_mode.png
similarity index 100%
rename from examples/declarative-camera/images/camera_auto_mode.png
rename to 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
similarity index 100%
rename from examples/declarative-camera/images/camera_camera_setting.png
rename to 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
similarity index 100%
rename from examples/declarative-camera/images/camera_flash_auto.png
rename to 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
similarity index 100%
rename from examples/declarative-camera/images/camera_flash_fill.png
rename to 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
similarity index 100%
rename from examples/declarative-camera/images/camera_flash_off.png
rename to 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
similarity index 100%
rename from examples/declarative-camera/images/camera_flash_redeye.png
rename to 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
similarity index 100%
rename from examples/declarative-camera/images/camera_white_balance_cloudy.png
rename to 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
similarity index 100%
rename from examples/declarative-camera/images/camera_white_balance_flourescent.png
rename to 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
similarity index 100%
rename from examples/declarative-camera/images/camera_white_balance_incandescent.png
rename to 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
similarity index 100%
rename from examples/declarative-camera/images/camera_white_balance_sunny.png
rename to 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
similarity index 100%
rename from examples/declarative-camera/images/toolbutton.png
rename to examples/multimediawidgets/declarative-camera/images/toolbutton.png
diff --git a/examples/declarative-camera/images/toolbutton.sci b/examples/multimediawidgets/declarative-camera/images/toolbutton.sci
similarity index 100%
rename from examples/declarative-camera/images/toolbutton.sci
rename to examples/multimediawidgets/declarative-camera/images/toolbutton.sci
diff --git a/examples/declarative-camera/qmlcamera.cpp b/examples/multimediawidgets/declarative-camera/qmlcamera.cpp
similarity index 100%
rename from examples/declarative-camera/qmlcamera.cpp
rename to examples/multimediawidgets/declarative-camera/qmlcamera.cpp
diff --git a/examples/multimediawidgets/multimediawidgets.pro b/examples/multimediawidgets/multimediawidgets.pro
new file mode 100644
index 0000000000000000000000000000000000000000..29d07bb304f08be94aa88ce6273353d96561cba1
--- /dev/null
+++ b/examples/multimediawidgets/multimediawidgets.pro
@@ -0,0 +1,18 @@
+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
+
+ QT += widgets
+}
+
+!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
similarity index 100%
rename from examples/player/doc/src/player.qdoc
rename to examples/multimediawidgets/player/doc/src/player.qdoc
diff --git a/examples/player/histogramwidget.cpp b/examples/multimediawidgets/player/histogramwidget.cpp
similarity index 100%
rename from examples/player/histogramwidget.cpp
rename to examples/multimediawidgets/player/histogramwidget.cpp
diff --git a/examples/player/histogramwidget.h b/examples/multimediawidgets/player/histogramwidget.h
similarity index 100%
rename from examples/player/histogramwidget.h
rename to examples/multimediawidgets/player/histogramwidget.h
diff --git a/examples/player/main.cpp b/examples/multimediawidgets/player/main.cpp
similarity index 100%
rename from examples/player/main.cpp
rename to examples/multimediawidgets/player/main.cpp
diff --git a/examples/player/player.cpp b/examples/multimediawidgets/player/player.cpp
similarity index 100%
rename from examples/player/player.cpp
rename to examples/multimediawidgets/player/player.cpp
diff --git a/examples/player/player.h b/examples/multimediawidgets/player/player.h
similarity index 100%
rename from examples/player/player.h
rename to examples/multimediawidgets/player/player.h
diff --git a/examples/player/player.pro b/examples/multimediawidgets/player/player.pro
similarity index 66%
rename from examples/player/player.pro
rename to examples/multimediawidgets/player/player.pro
index 2504f36124380e11c317d5d2ef32845dcef5c728..067b31b11b4e71b59913c7fd481fcc81e4f70826 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
similarity index 100%
rename from examples/player/playercontrols.cpp
rename to examples/multimediawidgets/player/playercontrols.cpp
diff --git a/examples/player/playercontrols.h b/examples/multimediawidgets/player/playercontrols.h
similarity index 100%
rename from examples/player/playercontrols.h
rename to examples/multimediawidgets/player/playercontrols.h
diff --git a/examples/player/playlistmodel.cpp b/examples/multimediawidgets/player/playlistmodel.cpp
similarity index 100%
rename from examples/player/playlistmodel.cpp
rename to examples/multimediawidgets/player/playlistmodel.cpp
diff --git a/examples/player/playlistmodel.h b/examples/multimediawidgets/player/playlistmodel.h
similarity index 100%
rename from examples/player/playlistmodel.h
rename to examples/multimediawidgets/player/playlistmodel.h
diff --git a/examples/player/videowidget.cpp b/examples/multimediawidgets/player/videowidget.cpp
similarity index 100%
rename from examples/player/videowidget.cpp
rename to examples/multimediawidgets/player/videowidget.cpp
diff --git a/examples/player/videowidget.h b/examples/multimediawidgets/player/videowidget.h
similarity index 100%
rename from examples/player/videowidget.h
rename to examples/multimediawidgets/player/videowidget.h
diff --git a/examples/videographicsitem/doc/images/video-videographicsitem.png b/examples/multimediawidgets/videographicsitem/doc/images/video-videographicsitem.png
similarity index 100%
rename from examples/videographicsitem/doc/images/video-videographicsitem.png
rename to 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
similarity index 100%
rename from examples/videographicsitem/doc/src/videographicsitem.qdoc
rename to examples/multimediawidgets/videographicsitem/doc/src/videographicsitem.qdoc
diff --git a/examples/videographicsitem/main.cpp b/examples/multimediawidgets/videographicsitem/main.cpp
similarity index 100%
rename from examples/videographicsitem/main.cpp
rename to examples/multimediawidgets/videographicsitem/main.cpp
diff --git a/examples/multimediawidgets/videographicsitem/videographicsitem.pro b/examples/multimediawidgets/videographicsitem/videographicsitem.pro
new file mode 100644
index 0000000000000000000000000000000000000000..30a9b6f21f95589fee3366fc44fe757bec1d75f3
--- /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
similarity index 100%
rename from examples/videographicsitem/videoplayer.cpp
rename to examples/multimediawidgets/videographicsitem/videoplayer.cpp
diff --git a/examples/videographicsitem/videoplayer.h b/examples/multimediawidgets/videographicsitem/videoplayer.h
similarity index 100%
rename from examples/videographicsitem/videoplayer.h
rename to examples/multimediawidgets/videographicsitem/videoplayer.h
diff --git a/examples/videowidget/doc/images/video-videowidget.png b/examples/multimediawidgets/videowidget/doc/images/video-videowidget.png
similarity index 100%
rename from examples/videowidget/doc/images/video-videowidget.png
rename to 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
similarity index 100%
rename from examples/videowidget/doc/src/videowidget.qdoc
rename to examples/multimediawidgets/videowidget/doc/src/videowidget.qdoc
diff --git a/examples/videowidget/main.cpp b/examples/multimediawidgets/videowidget/main.cpp
similarity index 100%
rename from examples/videowidget/main.cpp
rename to examples/multimediawidgets/videowidget/main.cpp
diff --git a/examples/videowidget/videoplayer.cpp b/examples/multimediawidgets/videowidget/videoplayer.cpp
similarity index 100%
rename from examples/videowidget/videoplayer.cpp
rename to examples/multimediawidgets/videowidget/videoplayer.cpp
diff --git a/examples/videowidget/videoplayer.h b/examples/multimediawidgets/videowidget/videoplayer.h
similarity index 100%
rename from examples/videowidget/videoplayer.h
rename to examples/multimediawidgets/videowidget/videoplayer.h
diff --git a/examples/multimediawidgets/videowidget/videowidget.pro b/examples/multimediawidgets/videowidget/videowidget.pro
new file mode 100644
index 0000000000000000000000000000000000000000..603996b2e3b3fed7ecea519237ccc434cf13b785
--- /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 6931879dd1584476fde372dee18d720ea6e49e08..0000000000000000000000000000000000000000
--- 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/video.pro b/examples/video/video.pro
deleted file mode 100644
index 96d48c0d3ad5b979031e244ed0ff6c04cb628e58..0000000000000000000000000000000000000000
--- 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 c9038357070985d2448d7d6e2a84bb8328512539..0000000000000000000000000000000000000000
--- 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 914f48e3124241350686bfe33d048c56e420e9a5..0000000000000000000000000000000000000000
--- 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