Merge branch 'camera' of ssh://codereview.qt-project.org:29418/qt/qtmultimediakit

Conflicts:
	src/imports/multimedia/multimedia.cpp
	src/imports/multimedia/multimedia.pro

Change-Id: I9d4bc1aa65f89ac24dd12c1e2c21a02f49913e13

diff --cc src/imports/multimedia/multimedia.cpp
index 6aebb74,753fc43..2de7401
--- 1/src/imports/multimedia/multimedia.cpp
--- 2/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@@ -48,12 -48,13 +48,15 @@@
  #include "qdeclarativemediametadata_p.h"
  #include "qdeclarativeaudio_p.h"
  #include "qdeclarativevideooutput_p.h"
- #if 0
 +#include "qdeclarativeradio_p.h"
 +#include "qdeclarativebackgroundaudio_p.h"
  #include "qdeclarativecamera_p.h"
  #include "qdeclarativecamerapreviewprovider_p.h"
- #endif
+ #include "qdeclarativecameraexposure_p.h"
+ #include "qdeclarativecameraflash_p.h"
+ #include "qdeclarativecamerafocus_p.h"
+ #include "qdeclarativecameraimageprocessing_p.h"
+ 
  
  QML_DECLARE_TYPE(QSoundEffect)
  
@@@ -71,12 -72,17 +74,19 @@@ public
          qmlRegisterType<QDeclarativeAudio>(uri, 4, 0, "Audio");
          qmlRegisterType<QDeclarativeAudio>(uri, 4, 0, "MediaPlayer");
          qmlRegisterType<QDeclarativeVideoOutput>(uri, 4, 0, "VideoOutput");
-         /* Disabled until ported to scenegraph */
- #if 0
 +        qmlRegisterType<QDeclarativeRadio>(uri, 4, 0, "Radio");
 +        qmlRegisterType<QDeclarativeBackgroundAudio>(uri, 4, 0, "BackgroundAudio");
          qmlRegisterType<QDeclarativeCamera>(uri, 4, 0, "Camera");
- #endif
+         qmlRegisterUncreatableType<QDeclarativeCameraCapture>(uri, 4, 0, "CameraCapture",
+                                 trUtf8("CameraCapture is only provided by Camera element"));
+         qmlRegisterUncreatableType<QDeclarativeCameraRecorder>(uri, 4, 0, "CameraRecorder",
+                                 trUtf8("CameraRecorder is only provided by Camera element"));
+         qmlRegisterUncreatableType<QDeclarativeCameraExposure>(uri, 4, 0, "CameraExposure",
+                                 trUtf8("CameraExposure is only provided by Camera element"));
+         qmlRegisterUncreatableType<QDeclarativeCameraFocus>(uri, 4, 0, "CameraFocus",
+                                 trUtf8("CameraFocus is only provided by Camera element"));
+         qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing>(uri, 4, 0, "CameraImageProcessing",
+                                 trUtf8("CameraImageProcessing is only provided by Camera element"));
          qmlRegisterType<QDeclarativeMediaMetaData>();
      }
  

diff --cc src/imports/multimedia/multimedia.pro
index 609e039,c300e98..4574d02
--- 1/src/imports/multimedia/multimedia.pro
--- 2/src/imports/multimedia/multimedia.pro
+++ b/src/imports/multimedia/multimedia.pro
@@@ -16,9 -16,16 +16,17 @@@ HEADERS += 
          qsgvideonode_p.h \
          qsgvideonode_i420.h \
          qsgvideonode_rgb32.h \
-         qdeclarativebackgroundaudio_p.h
 +        qdeclarativeradio_p.h \
++        qdeclarativebackgroundaudio_p.h \
+         qdeclarativecamera_p.h \
+         qdeclarativecameracapture_p.h \
+         qdeclarativecamerarecorder_p.h \
+         qdeclarativecameraexposure_p.h \
+         qdeclarativecameraflash_p.h \
+         qdeclarativecamerafocus_p.h \
+         qdeclarativecameraimageprocessing_p.h \
+         qdeclarativecamerapreviewprovider_p.h
  
 -
  SOURCES += \
          multimedia.cpp \
          qdeclarativeaudio.cpp \
@@@ -27,8 -34,14 +35,16 @@@
          qsgvideonode.cpp \
          qsgvideonode_i420.cpp \
          qsgvideonode_rgb32.cpp \
-         qdeclarativebackgroundaudio.cpp
 +        qdeclarativeradio.cpp \
++        qdeclarativebackgroundaudio.cpp \
+         qdeclarativecamera.cpp \
+         qdeclarativecameracapture.cpp \
+         qdeclarativecamerarecorder.cpp \
+         qdeclarativecameraexposure.cpp \
+         qdeclarativecameraflash.cpp \
+         qdeclarativecamerafocus.cpp \
+         qdeclarativecameraimageprocessing.cpp \
+         qdeclarativecamerapreviewprovider.cpp
  
  disabled {
      HEADERS += \