diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-07-16 10:55:20 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-16 07:18:12 +0200 |
| commit | b6a8c713bcc0b0cc032fdbf909143f3ba8ca15a6 (patch) | |
| tree | 8538a615fa11b5119199fdd77e31296fcf466b25 /src/plugins/gstreamer/camerabin/camerabinflash.h | |
| parent | fdc197d61402837b23ce5c1cfe3a56cf0fa9aafe (diff) | |
Updated the camerabin2 based camera with QtMultimedia changes
Moved it to the separate plugin as the rest of gstreamer based services;
Updated with libqgsttools_p changes;
Implemented QMediaRecorder::status property;
Made gst_photography dependency optional,
it's not always available on desktop;
Added video recording case to auto integration test;
Moved backend implementation into qt namespace
Task-number: QTBUG-26046
Change-Id: Iacfc1a6e263a4c0201d5eb28d04c960b87a230c0
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinflash.h')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinflash.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinflash.h b/src/plugins/gstreamer/camerabin/camerabinflash.h index bb4f3b9bd..3de4fde47 100644 --- a/src/plugins/gstreamer/camerabin/camerabinflash.h +++ b/src/plugins/gstreamer/camerabin/camerabinflash.h @@ -48,9 +48,9 @@ #include <gst/gst.h> #include <glib.h> -class CameraBinSession; +QT_BEGIN_NAMESPACE -QT_USE_NAMESPACE +class CameraBinSession; class Q_MULTIMEDIA_EXPORT CameraBinFlash : public QCameraFlashControl { @@ -69,5 +69,7 @@ private: CameraBinSession *m_session; }; +QT_END_NAMESPACE + #endif // CAMERABINFLASHCONTROL_H |