diff options
| author | axis <qt-info@nokia.com> | 2010-03-11 09:15:55 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-11 09:42:47 (GMT) |
| commit | a375537d32bc33ba1154ec132f99f5a779bce067 (patch) | |
| tree | 3c23e3b2c44fb52d7d62036fe7dd793e589841e8 /src/plugins/mediaservices/gstreamer/qgstreamermessage.cpp | |
| parent | 02f6da62a42bd1059eb0da091d1f46efbb919750 (diff) | |
| parent | 1e9552f826c05bf9884fb2893dedca265ead363b (diff) | |
| download | Qt-a375537d32bc33ba1154ec132f99f5a779bce067.zip Qt-a375537d32bc33ba1154ec132f99f5a779bce067.tar.gz Qt-a375537d32bc33ba1154ec132f99f5a779bce067.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/makefile.h
qmake/project.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
src/src.pro
Diffstat (limited to 'src/plugins/mediaservices/gstreamer/qgstreamermessage.cpp')
| -rw-r--r-- | src/plugins/mediaservices/gstreamer/qgstreamermessage.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/mediaservices/gstreamer/qgstreamermessage.cpp b/src/plugins/mediaservices/gstreamer/qgstreamermessage.cpp index 13a2454..d52aa75 100644 --- a/src/plugins/mediaservices/gstreamer/qgstreamermessage.cpp +++ b/src/plugins/mediaservices/gstreamer/qgstreamermessage.cpp @@ -44,11 +44,13 @@ #include "qgstreamermessage.h" +QT_BEGIN_NAMESPACE + static int wuchi = qRegisterMetaType<QGstreamerMessage>(); /*! - \class gstreamer::QGstreamerMessage + \class QGstreamerMessage \internal */ @@ -91,3 +93,5 @@ QGstreamerMessage& QGstreamerMessage::operator=(QGstreamerMessage const& rhs) return *this; } + +QT_END_NAMESPACE |