diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 09:40:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-26 09:40:11 (GMT) |
| commit | 2a898e4736dcafbe95dca120b2365bc24b395302 (patch) | |
| tree | 3031380514df8b82e423ded0401610bcbf89b6cf /src/multimedia/base/qmediaplaylistnavigator.cpp | |
| parent | 8b3fad1f7ac9bef0119fffc67feb5bb153abc647 (diff) | |
| parent | ae13ad51dda7246e73d282165201f637d04a667e (diff) | |
| download | Qt-2a898e4736dcafbe95dca120b2365bc24b395302.zip Qt-2a898e4736dcafbe95dca120b2365bc24b395302.tar.gz Qt-2a898e4736dcafbe95dca120b2365bc24b395302.tar.bz2 | |
Merge remote branch 'qt/master' into qml-master
Conflicts:
tools/qdoc3/cppcodeparser.cpp
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
tools/qdoc3/node.cpp
Diffstat (limited to 'src/multimedia/base/qmediaplaylistnavigator.cpp')
| -rw-r--r-- | src/multimedia/base/qmediaplaylistnavigator.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/multimedia/base/qmediaplaylistnavigator.cpp b/src/multimedia/base/qmediaplaylistnavigator.cpp index 3c22ea4..0c52c71 100644 --- a/src/multimedia/base/qmediaplaylistnavigator.cpp +++ b/src/multimedia/base/qmediaplaylistnavigator.cpp @@ -193,6 +193,7 @@ int QMediaPlaylistNavigatorPrivate::previousItemPos(int steps) const /*! \class QMediaPlaylistNavigator \preliminary + \since 4.7 \brief The QMediaPlaylistNavigator class provides navigation for a media playlist. \sa QMediaPlaylist, QMediaPlaylistProvider |