diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-01 05:05:24 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-01 05:05:24 (GMT) |
| commit | e8b2404e04ff38511a96ae2dfb2aa097c6ec8166 (patch) | |
| tree | 91f59051e690551cb89df3d0304bb714c711b2f0 /src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.cpp | |
| parent | 8095b3074a47ff317cafdce5e8a8f955bf8c97fa (diff) | |
| parent | 20def6f5fe3e02bda1c5f5873ed1923d36511312 (diff) | |
| download | Qt-e8b2404e04ff38511a96ae2dfb2aa097c6ec8166.zip Qt-e8b2404e04ff38511a96ae2dfb2aa097c6ec8166.tar.gz Qt-e8b2404e04ff38511a96ae2dfb2aa097c6ec8166.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Conflicts:
tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp
Diffstat (limited to 'src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.cpp')
| -rw-r--r-- | src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.cpp index 2e5d10f..600621e 100644 --- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.cpp +++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamerplayersession.cpp @@ -51,6 +51,9 @@ //#define USE_PLAYBIN2 + +QT_BEGIN_NAMESPACE + QGstreamerPlayerSession::QGstreamerPlayerSession(QObject *parent) :QObject(parent), m_state(QMediaPlayer::StoppedState), @@ -710,3 +713,6 @@ void QGstreamerPlayerSession::getStreamsInfo() emit streamsChanged(); } + +QT_END_NAMESPACE + |