Fix enums for QML camera types.
authorYoann Lopes <yoann.lopes@digia.com>
Thu, 13 Mar 2014 17:07:12 +0000 (18:07 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 24 Mar 2014 13:03:15 +0000 (14:03 +0100)
commit4aeda4943e9532719c49f02a5997f74fe4e0e7c9
treed933adeca548954bcda292ec0c94bf3ab4f15c49
parent904881d4a338b6259bb18320b0d09f79abe2aa5e
Fix enums for QML camera types.

CameraExposure, CameraFlash and CameraFocus had signals and functions
using enum-type arguments declared in QDeclarativeCamera. This doesn't
work since an enum and a function using it both need to be declared in
the same class in order to work from QML.
The relevant enums have been duplicated (not moved, in order to
preserve QML source compatibility) from QDeclarativeCamera to
QDeclarativeCameraExposure, QDeclarativeCameraFlash and
QDeclarativeCameraFocus.

Change-Id: Ib307d7c6c9dbc59b1b82782913397160be38d4cd
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
src/imports/multimedia/qdeclarativecameraexposure.cpp
src/imports/multimedia/qdeclarativecameraexposure_p.h
src/imports/multimedia/qdeclarativecameraflash.cpp
src/imports/multimedia/qdeclarativecameraflash_p.h
src/imports/multimedia/qdeclarativecamerafocus.cpp
src/imports/multimedia/qdeclarativecamerafocus_p.h