summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp16
-rw-r--r--src/plugins/gstreamer/camerabin/camerabinsession.h2
2 files changed, 1 insertions, 17 deletions
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)
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.h b/src/plugins/gstreamer/camerabin/camerabinsession.h
index 3540b1d09..39a595cf9 100644
--- a/src/plugins/gstreamer/camerabin/camerabinsession.h
+++ b/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"