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>
2013-07-19 12:47:55 +02:00
parent 44913bb75d
commit a91809bf0f
31 changed files with 2 additions and 7 deletions
--- a/examples/multimediawidgets/declarative-camera/CameraButton.qml
+++ b/examples/multimediawidgets/declarative-camera/CameraButton.qml
--- a/examples/multimediawidgets/declarative-camera/CameraPropertyButton.qml
+++ b/examples/multimediawidgets/declarative-camera/CameraPropertyButton.qml
--- a/examples/multimediawidgets/declarative-camera/CameraPropertyPopup.qml
+++ b/examples/multimediawidgets/declarative-camera/CameraPropertyPopup.qml
--- a/examples/multimediawidgets/declarative-camera/FocusButton.qml
+++ b/examples/multimediawidgets/declarative-camera/FocusButton.qml
--- a/examples/multimediawidgets/declarative-camera/PhotoCaptureControls.qml
+++ b/examples/multimediawidgets/declarative-camera/PhotoCaptureControls.qml
--- a/examples/multimediawidgets/declarative-camera/PhotoPreview.qml
+++ b/examples/multimediawidgets/declarative-camera/PhotoPreview.qml
--- a/examples/multimediawidgets/declarative-camera/VideoCaptureControls.qml
+++ b/examples/multimediawidgets/declarative-camera/VideoCaptureControls.qml
--- a/examples/multimediawidgets/declarative-camera/VideoPreview.qml
+++ b/examples/multimediawidgets/declarative-camera/VideoPreview.qml
--- a/examples/multimediawidgets/declarative-camera/ZoomControl.qml
+++ b/examples/multimediawidgets/declarative-camera/ZoomControl.qml
--- a/examples/multimediawidgets/declarative-camera/declarative-camera.pro
+++ b/examples/multimediawidgets/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

--- a/examples/multimediawidgets/declarative-camera/declarative-camera.qml
+++ b/examples/multimediawidgets/declarative-camera/declarative-camera.qml
--- a/examples/multimediawidgets/declarative-camera/declarative-camera.qmlproject
+++ b/examples/multimediawidgets/declarative-camera/declarative-camera.qmlproject
--- a/examples/multimediawidgets/declarative-camera/declarative-camera.qrc
+++ b/examples/multimediawidgets/declarative-camera/declarative-camera.qrc
--- a/examples/multimediawidgets/declarative-camera/doc/images/qml-camera.png
+++ b/examples/multimediawidgets/declarative-camera/doc/images/qml-camera.png
--- a/examples/multimediawidgets/declarative-camera/doc/src/declarative-camera.qdoc
+++ b/examples/multimediawidgets/declarative-camera/doc/src/declarative-camera.qdoc
--- a/examples/multimediawidgets/declarative-camera/images/camera_auto_mode.png
+++ b/examples/multimediawidgets/declarative-camera/images/camera_auto_mode.png
--- a/examples/multimediawidgets/declarative-camera/images/camera_camera_setting.png
+++ b/examples/multimediawidgets/declarative-camera/images/camera_camera_setting.png
--- a/examples/multimediawidgets/declarative-camera/images/camera_flash_auto.png
+++ b/examples/multimediawidgets/declarative-camera/images/camera_flash_auto.png
--- a/examples/multimediawidgets/declarative-camera/images/camera_flash_fill.png
+++ b/examples/multimediawidgets/declarative-camera/images/camera_flash_fill.png
--- a/examples/multimediawidgets/declarative-camera/images/camera_flash_off.png
+++ b/examples/multimediawidgets/declarative-camera/images/camera_flash_off.png
--- a/examples/multimediawidgets/declarative-camera/images/camera_flash_redeye.png
+++ b/examples/multimediawidgets/declarative-camera/images/camera_flash_redeye.png
--- a/examples/multimediawidgets/declarative-camera/images/camera_white_balance_cloudy.png
+++ b/examples/multimediawidgets/declarative-camera/images/camera_white_balance_cloudy.png
--- a/examples/multimediawidgets/declarative-camera/images/camera_white_balance_flourescent.png
+++ b/examples/multimediawidgets/declarative-camera/images/camera_white_balance_flourescent.png
--- a/examples/multimediawidgets/declarative-camera/images/camera_white_balance_incandescent.png
+++ b/examples/multimediawidgets/declarative-camera/images/camera_white_balance_incandescent.png
--- a/examples/multimediawidgets/declarative-camera/images/camera_white_balance_sunny.png
+++ b/examples/multimediawidgets/declarative-camera/images/camera_white_balance_sunny.png
--- a/examples/multimediawidgets/declarative-camera/images/toolbutton.png
+++ b/examples/multimediawidgets/declarative-camera/images/toolbutton.png
--- a/examples/multimediawidgets/declarative-camera/images/toolbutton.sci
+++ b/examples/multimediawidgets/declarative-camera/images/toolbutton.sci
--- a/examples/multimediawidgets/declarative-camera/qmlcamera.cpp
+++ b/examples/multimediawidgets/declarative-camera/qmlcamera.cpp
--- 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
 }
--- 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
-}
-
--- 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}