30 files changed, 2 insertions, 6 deletions

diff --git a/examples/multimediawidgets/declarative-camera/CameraButton.qml b/examples/multimedia/declarative-camera/CameraButton.qml
index b0353b4c3..b0353b4c3 100644
--- a/examples/multimediawidgets/declarative-camera/CameraButton.qml
+++ b/examples/multimedia/declarative-camera/CameraButton.qml
diff --git a/examples/multimediawidgets/declarative-camera/CameraPropertyButton.qml b/examples/multimedia/declarative-camera/CameraPropertyButton.qml
index 033f73415..033f73415 100644
--- a/examples/multimediawidgets/declarative-camera/CameraPropertyButton.qml
+++ b/examples/multimedia/declarative-camera/CameraPropertyButton.qml
diff --git a/examples/multimediawidgets/declarative-camera/CameraPropertyPopup.qml b/examples/multimedia/declarative-camera/CameraPropertyPopup.qml
index 130de95f4..130de95f4 100644
--- a/examples/multimediawidgets/declarative-camera/CameraPropertyPopup.qml
+++ b/examples/multimedia/declarative-camera/CameraPropertyPopup.qml
diff --git a/examples/multimediawidgets/declarative-camera/FocusButton.qml b/examples/multimedia/declarative-camera/FocusButton.qml
index b3966f249..b3966f249 100644
--- a/examples/multimediawidgets/declarative-camera/FocusButton.qml
+++ b/examples/multimedia/declarative-camera/FocusButton.qml
diff --git a/examples/multimediawidgets/declarative-camera/PhotoCaptureControls.qml b/examples/multimedia/declarative-camera/PhotoCaptureControls.qml
index 991a46e14..991a46e14 100644
--- a/examples/multimediawidgets/declarative-camera/PhotoCaptureControls.qml
+++ b/examples/multimedia/declarative-camera/PhotoCaptureControls.qml
diff --git a/examples/multimediawidgets/declarative-camera/PhotoPreview.qml b/examples/multimedia/declarative-camera/PhotoPreview.qml
index 34b272dc6..34b272dc6 100644
--- a/examples/multimediawidgets/declarative-camera/PhotoPreview.qml
+++ b/examples/multimedia/declarative-camera/PhotoPreview.qml
diff --git a/examples/multimediawidgets/declarative-camera/VideoCaptureControls.qml b/examples/multimedia/declarative-camera/VideoCaptureControls.qml
index e178ff15c..e178ff15c 100644
--- a/examples/multimediawidgets/declarative-camera/VideoCaptureControls.qml
+++ b/examples/multimedia/declarative-camera/VideoCaptureControls.qml
diff --git a/examples/multimediawidgets/declarative-camera/VideoPreview.qml b/examples/multimedia/declarative-camera/VideoPreview.qml
index 597b5b8c7..597b5b8c7 100644
--- a/examples/multimediawidgets/declarative-camera/VideoPreview.qml
+++ b/examples/multimedia/declarative-camera/VideoPreview.qml
diff --git a/examples/multimediawidgets/declarative-camera/ZoomControl.qml b/examples/multimedia/declarative-camera/ZoomControl.qml
index 1bfda7500..1bfda7500 100644
--- a/examples/multimediawidgets/declarative-camera/ZoomControl.qml
+++ b/examples/multimedia/declarative-camera/ZoomControl.qml
diff --git a/examples/multimediawidgets/declarative-camera/declarative-camera.pro b/examples/multimedia/declarative-camera/declarative-camera.pro
index 5fb0a1b51..71d4f68b0 100644
--- a/examples/multimediawidgets/declarative-camera/declarative-camera.pro
+++ b/examples/multimedia/declarative-camera/declarative-camera.pro
@@ -6,6 +6,6 @@ QT += quick qml multimedia
 SOURCES += qmlcamera.cpp
 RESOURCES += declarative-camera.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/declarative-camera
+target.path = $$[QT_INSTALL_EXAMPLES]/multimedia/declarative-camera
 INSTALLS += target
 
diff --git a/examples/multimediawidgets/declarative-camera/declarative-camera.qml b/examples/multimedia/declarative-camera/declarative-camera.qml
index 3e7ed4c25..3e7ed4c25 100644
--- a/examples/multimediawidgets/declarative-camera/declarative-camera.qml
+++ b/examples/multimedia/declarative-camera/declarative-camera.qml
diff --git a/examples/multimediawidgets/declarative-camera/declarative-camera.qmlproject b/examples/multimedia/declarative-camera/declarative-camera.qmlproject
index 53f5ecb8d..53f5ecb8d 100644
--- a/examples/multimediawidgets/declarative-camera/declarative-camera.qmlproject
+++ b/examples/multimedia/declarative-camera/declarative-camera.qmlproject
diff --git a/examples/multimediawidgets/declarative-camera/declarative-camera.qrc b/examples/multimedia/declarative-camera/declarative-camera.qrc
index d99b86c0c..d99b86c0c 100644
--- a/examples/multimediawidgets/declarative-camera/declarative-camera.qrc
+++ b/examples/multimedia/declarative-camera/declarative-camera.qrc
diff --git a/examples/multimediawidgets/declarative-camera/doc/images/qml-camera.png b/examples/multimedia/declarative-camera/doc/images/qml-camera.png
index 0cd61f0a0..0cd61f0a0 100644
--- a/examples/multimediawidgets/declarative-camera/doc/images/qml-camera.png
+++ b/examples/multimedia/declarative-camera/doc/images/qml-camera.png
diff --git a/examples/multimediawidgets/declarative-camera/doc/src/declarative-camera.qdoc b/examples/multimedia/declarative-camera/doc/src/declarative-camera.qdoc
index 02e77854c..02e77854c 100644
--- a/examples/multimediawidgets/declarative-camera/doc/src/declarative-camera.qdoc
+++ b/examples/multimedia/declarative-camera/doc/src/declarative-camera.qdoc
diff --git a/examples/multimediawidgets/declarative-camera/images/camera_auto_mode.png b/examples/multimedia/declarative-camera/images/camera_auto_mode.png
index f168296cf..f168296cf 100644
--- a/examples/multimediawidgets/declarative-camera/images/camera_auto_mode.png
+++ b/examples/multimedia/declarative-camera/images/camera_auto_mode.png
diff --git a/examples/multimediawidgets/declarative-camera/images/camera_camera_setting.png b/examples/multimedia/declarative-camera/images/camera_camera_setting.png
index 7b993eee9..7b993eee9 100644
--- a/examples/multimediawidgets/declarative-camera/images/camera_camera_setting.png
+++ b/examples/multimedia/declarative-camera/images/camera_camera_setting.png
diff --git a/examples/multimediawidgets/declarative-camera/images/camera_flash_auto.png b/examples/multimedia/declarative-camera/images/camera_flash_auto.png
index fb5cc40ec..fb5cc40ec 100644
--- a/examples/multimediawidgets/declarative-camera/images/camera_flash_auto.png
+++ b/examples/multimedia/declarative-camera/images/camera_flash_auto.png
diff --git a/examples/multimediawidgets/declarative-camera/images/camera_flash_fill.png b/examples/multimedia/declarative-camera/images/camera_flash_fill.png
index 7bc5949ac..7bc5949ac 100644
--- a/examples/multimediawidgets/declarative-camera/images/camera_flash_fill.png
+++ b/examples/multimedia/declarative-camera/images/camera_flash_fill.png
diff --git a/examples/multimediawidgets/declarative-camera/images/camera_flash_off.png b/examples/multimedia/declarative-camera/images/camera_flash_off.png
index 3c5db10cc..3c5db10cc 100644
--- a/examples/multimediawidgets/declarative-camera/images/camera_flash_off.png
+++ b/examples/multimedia/declarative-camera/images/camera_flash_off.png
diff --git a/examples/multimediawidgets/declarative-camera/images/camera_flash_redeye.png b/examples/multimedia/declarative-camera/images/camera_flash_redeye.png
index 534a087df..534a087df 100644
--- a/examples/multimediawidgets/declarative-camera/images/camera_flash_redeye.png
+++ b/examples/multimedia/declarative-camera/images/camera_flash_redeye.png
diff --git a/examples/multimediawidgets/declarative-camera/images/camera_white_balance_cloudy.png b/examples/multimedia/declarative-camera/images/camera_white_balance_cloudy.png
index 243b699e7..243b699e7 100644
--- a/examples/multimediawidgets/declarative-camera/images/camera_white_balance_cloudy.png
+++ b/examples/multimedia/declarative-camera/images/camera_white_balance_cloudy.png
diff --git a/examples/multimediawidgets/declarative-camera/images/camera_white_balance_flourescent.png b/examples/multimedia/declarative-camera/images/camera_white_balance_flourescent.png
index 032efe1d1..032efe1d1 100644
--- a/examples/multimediawidgets/declarative-camera/images/camera_white_balance_flourescent.png
+++ b/examples/multimedia/declarative-camera/images/camera_white_balance_flourescent.png
diff --git a/examples/multimediawidgets/declarative-camera/images/camera_white_balance_incandescent.png b/examples/multimedia/declarative-camera/images/camera_white_balance_incandescent.png
index 98f906741..98f906741 100644
--- a/examples/multimediawidgets/declarative-camera/images/camera_white_balance_incandescent.png
+++ b/examples/multimedia/declarative-camera/images/camera_white_balance_incandescent.png
diff --git a/examples/multimediawidgets/declarative-camera/images/camera_white_balance_sunny.png b/examples/multimedia/declarative-camera/images/camera_white_balance_sunny.png
index d7d5c9a36..d7d5c9a36 100644
--- a/examples/multimediawidgets/declarative-camera/images/camera_white_balance_sunny.png
+++ b/examples/multimedia/declarative-camera/images/camera_white_balance_sunny.png
diff --git a/examples/multimediawidgets/declarative-camera/images/toolbutton.png b/examples/multimedia/declarative-camera/images/toolbutton.png
index 11310013e..11310013e 100644
--- a/examples/multimediawidgets/declarative-camera/images/toolbutton.png
+++ b/examples/multimedia/declarative-camera/images/toolbutton.png
diff --git a/examples/multimediawidgets/declarative-camera/images/toolbutton.sci b/examples/multimedia/declarative-camera/images/toolbutton.sci
index 9e4f96530..9e4f96530 100644
--- a/examples/multimediawidgets/declarative-camera/images/toolbutton.sci
+++ b/examples/multimedia/declarative-camera/images/toolbutton.sci
diff --git a/examples/multimediawidgets/declarative-camera/qmlcamera.cpp b/examples/multimedia/declarative-camera/qmlcamera.cpp
index bf74831a3..bf74831a3 100644
--- a/examples/multimediawidgets/declarative-camera/qmlcamera.cpp
+++ b/examples/multimedia/declarative-camera/qmlcamera.cpp
diff --git a/examples/multimedia/multimedia.pro b/examples/multimedia/multimedia.pro
index bacbba984..667746fe8 100644
--- a/examples/multimedia/multimedia.pro
+++ b/examples/multimedia/multimedia.pro
@@ -15,6 +15,7 @@ qtHaveModule(widgets) {
 
 qtHaveModule(gui):qtHaveModule(qml) {
     SUBDIRS += \
+        declarative-camera \
         declarative-radio \
         video
 }
diff --git a/examples/multimediawidgets/multimediawidgets.pro b/examples/multimediawidgets/multimediawidgets.pro
index d8990cdc3..001a78d50 100644
--- a/examples/multimediawidgets/multimediawidgets.pro
+++ b/examples/multimediawidgets/multimediawidgets.pro
@@ -9,8 +9,3 @@ qtHaveModule(widgets) {
         player \
         customvideosurface
 }
-
-qtHaveModule(gui):qtHaveModule(qml) {
-    disabled:SUBDIRS += declarative-camera
-}
-