diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-02-25 18:17:16 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-02-25 18:17:16 (GMT) |
| commit | cf58c6bd5204edaff0a34bae5312798fc3700c94 (patch) | |
| tree | 600e48add5404922ee866fe0bdf5f36340dfba39 /src/multimedia/playback/qmediaplayer.cpp | |
| parent | 2d89ee9cc302f7d381275a112e1c8a5de55ec286 (diff) | |
| parent | ff8c63b4b40b26291f8847830e04f773dc1a1e71 (diff) | |
| download | Qt-cf58c6bd5204edaff0a34bae5312798fc3700c94.zip Qt-cf58c6bd5204edaff0a34bae5312798fc3700c94.tar.gz Qt-cf58c6bd5204edaff0a34bae5312798fc3700c94.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'src/multimedia/playback/qmediaplayer.cpp')
| -rw-r--r-- | src/multimedia/playback/qmediaplayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index ca34993..27bff02 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -66,7 +66,7 @@ QT_MODULE(Multimedia) \class QMediaPlayer \brief The QMediaPlayer class allows the playing of a media source. \ingroup multimedia - + \since 4.7 \preliminary The QMediaPlayer class is a high level media playback class. It can be used |