slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix build for the camera support of QtMultimedia GStreamer plugin.

Browse Source 
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>
This commit is contained in:
Alexis Menard
2012-01-13 09:28:19 -03:00
committed by Qt by Nokia
parent c8f48841ef
commit 0c88091bfc
2 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
View File

@@ -54,22 +54,6 @@
#define IMAGE_DONE_SIGNAL "image-done" #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) CameraBinImageCapture::CameraBinImageCapture(CameraBinSession *session)
:QCameraImageCaptureControl(session) :QCameraImageCaptureControl(session)

2
src/plugins/gstreamer/camerabin/camerabinsession.h
View File

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