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/camerabincontrol.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/camerabincontrol.h')
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabincontrol.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabincontrol.h b/src/plugins/gstreamer/camerabin/camerabincontrol.h index 5bba19e76..664bc3e9d 100644 --- a/src/plugins/gstreamer/camerabin/camerabincontrol.h +++ b/src/plugins/gstreamer/camerabin/camerabincontrol.h @@ -47,7 +47,7 @@ #include <qcameracontrol.h> #include "camerabinsession.h" -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class CamerabinResourcePolicy; @@ -98,4 +98,6 @@ private: bool m_reloadPending; }; +QT_END_NAMESPACE + #endif // CAMERABINCONTROL_H |