From 0c88091bfc8d32c23cb62473b229d96437ec664d Mon Sep 17 00:00:00 2001
From: Alexis Menard <alexis.menard@openbossa.org>
Date: Fri, 13 Jan 2012 09:28:19 -0300
Subject: Fix build for the camera support of QtMultimedia GStreamer plugin.

Include the correct header file (it was renamed) and also remove
duplicate declaration.

Change-Id: I2683851e9fd0978427273c4739f47b54e1af743b
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
---
 .../gstreamer/camerabin/camerabinimagecapture.cpp        | 16 ----------------
 1 file changed, 16 deletions(-)

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

diff --git a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
index 50018da1f..c18f411b0 100644
--- a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
@@ -54,22 +54,6 @@
 
 #define IMAGE_DONE_SIGNAL "image-done"
 
-Q_DECLARE_METATYPE(QVideoFrame)
-Q_DECLARE_METATYPE(QtMultimedia::MetaData)
-
-namespace
-{
-class CameraRegisterMetaTypes
-{
-public:
-    CameraRegisterMetaTypes()
-    {
-        qRegisterMetaType<QVideoFrame>("QVideoFrame");
-        qRegisterMetaType<QtMultimedia::MetaData>("QtMultimedia::MetaData");
-    }
-} _registerCameraMetaTypes;
-}
-
 
 CameraBinImageCapture::CameraBinImageCapture(CameraBinSession *session)
     :QCameraImageCaptureControl(session)
-- 
cgit v1.2.3