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

src/imports/multimedia/multimedia.pro

@@ -17,7 +17,15 @@ HEADERS += \
         qsgvideonode_i420.h \
         qsgvideonode_rgb32.h \
         qdeclarativeradio_p.h \
-        qdeclarativebackgroundaudio_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 \
@@ -28,18 +36,24 @@ SOURCES += \
         qsgvideonode_i420.cpp \
         qsgvideonode_rgb32.cpp \
         qdeclarativeradio.cpp \
-        qdeclarativebackgroundaudio.cpp
+        qdeclarativebackgroundaudio.cpp \
+        qdeclarativecamera.cpp \
+        qdeclarativecameracapture.cpp \
+        qdeclarativecamerarecorder.cpp \
+        qdeclarativecameraexposure.cpp \
+        qdeclarativecameraflash.cpp \
+        qdeclarativecamerafocus.cpp \
+        qdeclarativecameraimageprocessing.cpp \
+        qdeclarativecamerapreviewprovider.cpp
 
 disabled {
     HEADERS += \
         qdeclarativevideo_p.h \
-        qdeclarativecamera_p.h \
-        qdeclarativecamerapreviewprovider_p.h
+
 
     SOURCES += \
         qdeclarativevideo.cpp \
-        qdeclarativecamera.cpp \
-        qdeclarativecamerapreviewprovider.cpp
+
 }
 
 qmldir.files += $$PWD/qmldir