diff options
| author | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-04-20 11:52:57 +0300 |
|---|---|---|
| committer | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-04-20 11:52:57 +0300 |
| commit | fb3e9bc2d941462f1244aaf0ea79425a307f883d (patch) | |
| tree | afce91959098ec887ce466abc6e40342261df3db /src/multimedia/qmediaimageviewer.cpp | |
| parent | c61d909c7b815319e40ba27d7f84e92aa5f1f946 (diff) | |
| parent | 6f0dc7cc40dd63763a581a7fb6d4e76649b8026c (diff) | |
Merge branch 'master' into 1.2.0v1.2.0
Diffstat (limited to 'src/multimedia/qmediaimageviewer.cpp')
| -rw-r--r-- | src/multimedia/qmediaimageviewer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/multimedia/qmediaimageviewer.cpp b/src/multimedia/qmediaimageviewer.cpp index 386aca567a..83aa166133 100644 --- a/src/multimedia/qmediaimageviewer.cpp +++ b/src/multimedia/qmediaimageviewer.cpp @@ -139,7 +139,8 @@ void QMediaImageViewerPrivate::_q_playlistDestroyed() \brief The QMediaImageViewer class provides a means of viewing image media. \inmodule QtMultimediaKit \ingroup multimedia - + \since 1.0 + QMediaImageViewer is used together with a media display object such as QVideoWidget to present an image. A display object is attached to the |