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

Merge remote-tracking branch 'origin/5.3' into dev

Browse Source 
Conflicts:
	.qmake.conf

Change-Id: Iecd8d7b94e52a8981526b12cffa40e99870ba62f
This commit is contained in:
Sergio Ahumada
2014-06-14 21:59:24 +02:00
parent d415d3256d 150ff6662d
commit d691f5ca2b
168 changed files with 2725 additions and 2694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/multimedia/video/qabstractvideobuffer.cpp
View File

@@ -48,19 +48,15 @@
QT_BEGIN_NAMESPACE
namespace
static void qRegisterAbstractVideoBufferMetaTypes()
{
class QAbstractVideoBufferPrivateRegisterMetaTypes
{
public:
QAbstractVideoBufferPrivateRegisterMetaTypes()
{
qRegisterMetaType<QAbstractVideoBuffer::HandleType>();
qRegisterMetaType<QAbstractVideoBuffer::MapMode>();
}
} _registerMetaTypes;
qRegisterMetaType<QAbstractVideoBuffer::HandleType>();
qRegisterMetaType<QAbstractVideoBuffer::MapMode>();
}
Q_CONSTRUCTOR_FUNCTION(qRegisterAbstractVideoBufferMetaTypes)
/*!
\class QAbstractVideoBuffer
\brief The QAbstractVideoBuffer class is an abstraction for video data.

13
src/multimedia/video/qabstractvideosurface.cpp
View File

@@ -50,18 +50,13 @@
QT_BEGIN_NAMESPACE
namespace
static void qRegisterAbstractVideoSurfaceMetaTypes()
{
class QAbstractVideoSurfacePrivateRegisterMetaTypes
{
public:
QAbstractVideoSurfacePrivateRegisterMetaTypes()
{
qRegisterMetaType<QAbstractVideoSurface::Error>();
}
} _registerMetaTypes;
qRegisterMetaType<QAbstractVideoSurface::Error>();
}
Q_CONSTRUCTOR_FUNCTION(qRegisterAbstractVideoSurfaceMetaTypes)
class QAbstractVideoSurfacePrivate {
public:

17
src/multimedia/video/qvideoframe.cpp
View File

@@ -55,20 +55,15 @@
QT_BEGIN_NAMESPACE
namespace
static void qRegisterVideoFrameMetaTypes()
{
class QVideoFramePrivateRegisterMetaTypes
{
public:
QVideoFramePrivateRegisterMetaTypes()
{
qRegisterMetaType<QVideoFrame>();
qRegisterMetaType<QVideoFrame::FieldType>();
qRegisterMetaType<QVideoFrame::PixelFormat>();
}
} _registerMetaTypes;
qRegisterMetaType<QVideoFrame>();
qRegisterMetaType<QVideoFrame::FieldType>();
qRegisterMetaType<QVideoFrame::PixelFormat>();
}
Q_CONSTRUCTOR_FUNCTION(qRegisterVideoFrameMetaTypes)
class QVideoFramePrivate : public QSharedData
{

17
src/multimedia/video/qvideosurfaceformat.cpp
View File

@@ -49,20 +49,15 @@
QT_BEGIN_NAMESPACE
namespace
static void qRegisterVideoSurfaceFormatMetaTypes()
{
class QVideoSurfaceFormatPrivateRegisterMetaTypes
{
public:
QVideoSurfaceFormatPrivateRegisterMetaTypes()
{
qRegisterMetaType<QVideoSurfaceFormat>();
qRegisterMetaType<QVideoSurfaceFormat::Direction>();
qRegisterMetaType<QVideoSurfaceFormat::YCbCrColorSpace>();
}
} _registerMetaTypes;
qRegisterMetaType<QVideoSurfaceFormat>();
qRegisterMetaType<QVideoSurfaceFormat::Direction>();
qRegisterMetaType<QVideoSurfaceFormat::YCbCrColorSpace>();
}
Q_CONSTRUCTOR_FUNCTION(qRegisterVideoSurfaceFormatMetaTypes)
class QVideoSurfaceFormatPrivate : public QSharedData
{