diff options
| author | Alexis Menard <alexis.menard@openbossa.org> | 2012-01-13 09:28:19 -0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-14 09:14:54 +0100 |
| commit | 0c88091bfc8d32c23cb62473b229d96437ec664d (patch) | |
| tree | fcb0084b56abb623203b415ee0b226acaa5c0c5a /src | |
| parent | c8f48841ef86d27b363ef3332158e8952165853d (diff) | |
| download | qtmultimedia-0c88091bfc8d32c23cb62473b229d96437ec664d.tar.gz | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp | 16 | ||||
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinsession.h | 2 |
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" |