Moved declarative-camera example in the right directory.

This example was in the multimediawidgets directory but doesn't depend on
or use the QtMultimediaWidgets module. Moved to 'examples/multimedia'
instead.

Change-Id: Ic2fcc6576e95664e0002531ee378a4366daa56c1
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

diff --git a/examples/multimediawidgets/declarative-camera/CameraButton.qml b/examples/multimedia/declarative-camera/CameraButton.qml
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/CameraButton.qml
rename to examples/multimedia/declarative-camera/CameraButton.qml

diff --git a/examples/multimediawidgets/declarative-camera/CameraPropertyButton.qml b/examples/multimedia/declarative-camera/CameraPropertyButton.qml
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/CameraPropertyButton.qml
rename to examples/multimedia/declarative-camera/CameraPropertyButton.qml

diff --git a/examples/multimediawidgets/declarative-camera/CameraPropertyPopup.qml b/examples/multimedia/declarative-camera/CameraPropertyPopup.qml
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/CameraPropertyPopup.qml
rename to examples/multimedia/declarative-camera/CameraPropertyPopup.qml

diff --git a/examples/multimediawidgets/declarative-camera/FocusButton.qml b/examples/multimedia/declarative-camera/FocusButton.qml
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/FocusButton.qml
rename to examples/multimedia/declarative-camera/FocusButton.qml

diff --git a/examples/multimediawidgets/declarative-camera/PhotoCaptureControls.qml b/examples/multimedia/declarative-camera/PhotoCaptureControls.qml
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/PhotoCaptureControls.qml
rename to examples/multimedia/declarative-camera/PhotoCaptureControls.qml

diff --git a/examples/multimediawidgets/declarative-camera/PhotoPreview.qml b/examples/multimedia/declarative-camera/PhotoPreview.qml
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/PhotoPreview.qml
rename to examples/multimedia/declarative-camera/PhotoPreview.qml

diff --git a/examples/multimediawidgets/declarative-camera/VideoCaptureControls.qml b/examples/multimedia/declarative-camera/VideoCaptureControls.qml
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/VideoCaptureControls.qml
rename to examples/multimedia/declarative-camera/VideoCaptureControls.qml

diff --git a/examples/multimediawidgets/declarative-camera/VideoPreview.qml b/examples/multimedia/declarative-camera/VideoPreview.qml
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/VideoPreview.qml
rename to examples/multimedia/declarative-camera/VideoPreview.qml

diff --git a/examples/multimediawidgets/declarative-camera/ZoomControl.qml b/examples/multimedia/declarative-camera/ZoomControl.qml
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/ZoomControl.qml
rename to examples/multimedia/declarative-camera/ZoomControl.qml

diff --git a/examples/multimediawidgets/declarative-camera/declarative-camera.pro b/examples/multimedia/declarative-camera/declarative-camera.pro
similarity index 66%
rename from examples/multimediawidgets/declarative-camera/declarative-camera.pro
rename to examples/multimedia/declarative-camera/declarative-camera.pro
index 5fb0a1b..71d4f68 100644 (file)
--- 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
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/declarative-camera.qml
rename to 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
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/declarative-camera.qmlproject
rename to 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
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/declarative-camera.qrc
rename to 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
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/doc/images/qml-camera.png
rename to 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
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/doc/src/declarative-camera.qdoc
rename to 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
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/images/camera_auto_mode.png
rename to 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
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/images/camera_camera_setting.png
rename to 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
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/images/camera_flash_auto.png
rename to 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
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/images/camera_flash_fill.png
rename to 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
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/images/camera_flash_off.png
rename to 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
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/images/camera_flash_redeye.png
rename to 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
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/images/camera_white_balance_cloudy.png
rename to 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
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/images/camera_white_balance_flourescent.png
rename to 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
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/images/camera_white_balance_incandescent.png
rename to 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
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/images/camera_white_balance_sunny.png
rename to 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
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/images/toolbutton.png
rename to 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
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/images/toolbutton.sci
rename to examples/multimedia/declarative-camera/images/toolbutton.sci

diff --git a/examples/multimediawidgets/declarative-camera/qmlcamera.cpp b/examples/multimedia/declarative-camera/qmlcamera.cpp
similarity index 100%
rename from examples/multimediawidgets/declarative-camera/qmlcamera.cpp
rename to examples/multimedia/declarative-camera/qmlcamera.cpp

diff --git a/examples/multimedia/multimedia.pro b/examples/multimedia/multimedia.pro
index bacbba9..667746f 100644 (file)
--- 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 d8990cd..001a78d 100644 (file)
--- 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
-}
-

diff --git a/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc b/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc
index 07fa632..e722f4c 100644 (file)
--- a/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc
+++ b/src/multimediawidgets/doc/src/qtmultimediawidgets-index.qdoc
@@ -57,7 +57,6 @@ QT += multimediawidgets
 
 \section2 Examples
 \list
-\li \l{QML Camera Example}
 \li \l{Camera Example}
 \li \l{Media Player Example}
 \li \l{Video Graphics Item Example}