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>

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)

src/plugins/gstreamer/camerabin/camerabinsession.h

@@ -50,7 +50,7 @@
 #include <gst/gst.h>
 #include <gst/interfaces/photography.h>
 
-#include "qgstreamerbushelper.h"
+#include <private/qgstreamerbushelper_p.h>
 #include "qcamera.h"