diff options
| author | Jonas Rabbe <jonas.rabbe@nokia.com> | 2012-03-14 08:39:43 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-14 05:55:40 +0100 |
| commit | 8e82f57c6ac2db6754bfcd6828accb2fcfb77891 (patch) | |
| tree | a2da3764d5f32442d7341a2a4610883ebe3da328 /src/imports/multimedia/qdeclarativecamera_p.h | |
| parent | 8d637854254255860ac40dbe5a96328de99f6f7a (diff) | |
Updated declarative components to use the QML module
Change-Id: I4b49466ba5248683c2285f98ce17bc2c24bba515
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/imports/multimedia/qdeclarativecamera_p.h')
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamera_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h index 8ac99574b..396ce80e0 100644 --- a/src/imports/multimedia/qdeclarativecamera_p.h +++ b/src/imports/multimedia/qdeclarativecamera_p.h @@ -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) |