Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	.qmake.conf

Change-Id: Id367a610a3aefd288bfe287a3bf64606e582deb9

1 files changed, 9 insertions, 0 deletions

diff --git a/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.h b/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.h
index 31700958d..f4cbb7c93 100644
--- a/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.h
+++ b/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.h
@@ -69,18 +69,27 @@ public:
 
     bool isResourcesGranted() const;
 
+    bool canCapture() const;
+
 Q_SIGNALS:
     void resourcesDenied();
     void resourcesGranted();
     void resourcesLost();
+    void canCaptureChanged();
 
 private Q_SLOTS:
+    void handleResourcesLost();
+    void handleResourcesGranted();
     void handleResourcesReleased();
+    void resourcesAvailable();
+    void updateCanCapture();
+
 
 private:
     ResourceSet m_resourceSet;
     ResourcePolicy::ResourceSet *m_resource;
     bool m_releasingResources;
+    bool m_canCapture;
 };
 
 QT_END_NAMESPACE