Fixed QtMultimedia core namespace compilation.
Change-Id: Ie276a7766bd26f3e49b2bc9c1a28ec96f1e3e4b0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
committed by
Qt by Nokia
parent
b05819f939
commit
581564c990
@@ -48,7 +48,6 @@ QGstBufferPoolPlugin::QGstBufferPoolPlugin(QObject *parent) :
|
||||
{
|
||||
}
|
||||
|
||||
#include "moc_qgstbufferpoolinterface_p.cpp"
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#include "moc_qgstbufferpoolinterface_p.cpp"
|
||||
|
||||
@@ -46,6 +46,7 @@
|
||||
|
||||
#include "qgstreamerbushelper_p.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
#ifndef QT_NO_GLIB
|
||||
class QGstreamerBusHelperPrivate : public QObject
|
||||
@@ -234,4 +235,6 @@ void QGstreamerBusHelper::removeMessageFilter(QObject *filter)
|
||||
d->busFilters.removeAll(busFilter);
|
||||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#include "qgstreamerbushelper.moc"
|
||||
|
||||
@@ -43,6 +43,7 @@
|
||||
|
||||
#include "qgstreamermessage_p.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
static int wuchi = qRegisterMetaType<QGstreamerMessage>();
|
||||
|
||||
@@ -91,3 +92,5 @@ QGstreamerMessage& QGstreamerMessage::operator=(QGstreamerMessage const& rhs)
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
@@ -46,6 +46,8 @@
|
||||
#include <QtCore/qvariant.h>
|
||||
#include <QtCore/qsize.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
//internal
|
||||
static void addTagToMap(const GstTagList *list,
|
||||
const gchar *tag,
|
||||
@@ -163,3 +165,5 @@ QSize QGstUtils::capsCorrectedResolution(const GstCaps *caps)
|
||||
|
||||
return size;
|
||||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
@@ -41,6 +41,7 @@
|
||||
|
||||
#include "qgstvideobuffer_p.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
QGstVideoBuffer::QGstVideoBuffer(GstBuffer *buffer, int bytesPerLine)
|
||||
: QAbstractVideoBuffer(NoHandle)
|
||||
@@ -95,3 +96,4 @@ void QGstVideoBuffer::unmap()
|
||||
m_mode = NotMapped;
|
||||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
@@ -50,6 +50,8 @@
|
||||
|
||||
#ifndef QT_NO_XVIDEO
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
GstBufferClass *QGstXvImageBuffer::parent_class = NULL;
|
||||
|
||||
GType QGstXvImageBuffer::get_type(void)
|
||||
@@ -307,5 +309,7 @@ void QGstXvImageBufferPool::destroyBuffer(QGstXvImageBuffer *xvBuffer)
|
||||
QMetaObject::invokeMethod(this, "queuedDestroy", Qt::QueuedConnection);
|
||||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif //QT_NO_XVIDEO
|
||||
|
||||
|
||||
Reference in New Issue
Block a user