From b6a8c713bcc0b0cc032fdbf909143f3ba8ca15a6 Mon Sep 17 00:00:00 2001
From: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Date: Mon, 16 Jul 2012 10:55:20 +1000
Subject: 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>
---
 src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp')

diff --git a/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp b/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp
index 8e0ee17bf..cd18aaa28 100644
--- a/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp
@@ -51,6 +51,8 @@
 #include <policy/resource-set.h>
 #endif
 
+QT_BEGIN_NAMESPACE
+
 CamerabinResourcePolicy::CamerabinResourcePolicy(QObject *parent) :
     QObject(parent),
     m_resourceSet(NoResources),
@@ -182,3 +184,5 @@ void CamerabinResourcePolicy::handleResourcesReleased()
     m_releasingResources = false;
 #endif
 }
+
+QT_END_NAMESPACE
-- 
cgit v1.2.3