slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated declarative components to use the QML module

Browse Source 
Change-Id: I4b49466ba5248683c2285f98ce17bc2c24bba515
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Jonas Rabbe
2012-03-14 08:39:43 +10:00
committed by Qt by Nokia
parent 8d63785425
commit 8e82f57c6a
31 changed files with 78 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/imports/multimedia/qdeclarativecamera_p.h
View File

@@ -62,8 +62,8 @@
#include <QtCore/qbasictimer.h>
#include <QtCore/qdatetime.h>
#include <QtDeclarative/qdeclarative.h>
#include <QtDeclarative/qdeclarativeparserstatus.h>
#include <QtQml/qqmlparserstatus.h>
#include <QtQml/qqml.h>
QT_BEGIN_HEADER
@@ -74,10 +74,10 @@ class QDeclarativeCameraFocus;
class QDeclarativeCameraFlash;
class QDeclarativeCameraImageProcessing;
class QDeclarativeCamera : public QObject, public QDeclarativeParserStatus
class QDeclarativeCamera : public QObject, public QQmlParserStatus
{
Q_OBJECT
Q_INTERFACES(QDeclarativeParserStatus)
Q_INTERFACES(QQmlParserStatus)
Q_PROPERTY(CaptureMode captureMode READ captureMode WRITE setCaptureMode NOTIFY captureModeChanged)
Q_PROPERTY(State cameraState READ cameraState WRITE setCameraState NOTIFY cameraStateChanged)