diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-11-03 15:37:05 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-03 15:37:05 (GMT) |
| commit | c0a58b079d00dad484faa6249b8109a639576399 (patch) | |
| tree | d2828950d8e5664da5606783161f2a48db3ce722 /src/3rdparty/phonon/gstreamer | |
| parent | 93ec4104781d7f9929b8b8a05dee3d94f8cd4b17 (diff) | |
| parent | c95a0e6e8eb8ba5fd2a4412b318ad998b3ccb4fc (diff) | |
| download | Qt-c0a58b079d00dad484faa6249b8109a639576399.zip Qt-c0a58b079d00dad484faa6249b8109a639576399.tar.gz Qt-c0a58b079d00dad484faa6249b8109a639576399.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6
Conflicts:
src/gui/kernel/qevent.cpp
src/network/ssl/qsslerror.cpp
Diffstat (limited to 'src/3rdparty/phonon/gstreamer')
| -rw-r--r-- | src/3rdparty/phonon/gstreamer/mediaobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/gstreamer/mediaobject.cpp b/src/3rdparty/phonon/gstreamer/mediaobject.cpp index 1c32c3c..5713263 100644 --- a/src/3rdparty/phonon/gstreamer/mediaobject.cpp +++ b/src/3rdparty/phonon/gstreamer/mediaobject.cpp @@ -87,7 +87,7 @@ MediaObject::MediaObject(Backend *backend, QObject *parent) m_name = "MediaObject" + QString::number(count++); if (!m_backend->isValid()) { - setError(tr("Cannot start playback. \n\nCheck your Gstreamer installation and make sure you " + setError(tr("Cannot start playback. \n\nCheck your GStreamer installation and make sure you " "\nhave libgstreamer-plugins-base installed."), Phonon::FatalError); } else { m_root = this; |