Merge branch 'master' into 1.2.0v1.2.0

58 files changed, 170 insertions, 41 deletions

diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp
index 8efbe5b131..c0e2ed9f16 100644
--- a/src/multimedia/audio/qaudiodeviceinfo.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo.cpp
@@ -125,8 +125,8 @@ public:
     functions defaultInputDevice(), defaultOutputDevice(), and
     availableDevices() let you get a list of all available
     devices. Devices are fetch according to the value of mode
-    this is specified by the QAudio::Mode enum.
-    The QAudioDeviceInfo returned are only valid for the QAudio::Mode.
+    this is specified by the \l {QAudio}::Mode enum.
+    The QAudioDeviceInfo returned are only valid for the \l {QAudio}::Mode.
 
     For instance:
 
@@ -213,7 +213,7 @@ bool QAudioDeviceInfo::isFormatSupported(const QAudioFormat &settings) const
 
     These settings are provided by the platform/audio plugin being used.
 
-    They also are dependent on the QAudio::Mode being used.
+    They also are dependent on the \l {QAudio}::Mode being used.
 
     A typical audio system would provide something like:
     \list
@@ -232,7 +232,7 @@ QAudioFormat QAudioDeviceInfo::preferredFormat() const
 
     These settings are provided by the platform/audio plugin being used.
 
-    They also are dependent on the QAudio::Mode being used.
+    They also are dependent on the \l {QAudio}::Mode being used.
 */
 
 QAudioFormat QAudioDeviceInfo::nearestFormat(const QAudioFormat &settings) const
diff --git a/src/multimedia/audio/qaudiosystem.cpp b/src/multimedia/audio/qaudiosystem.cpp
index 1fd0a80418..2eb3bf6f27 100644
--- a/src/multimedia/audio/qaudiosystem.cpp
+++ b/src/multimedia/audio/qaudiosystem.cpp
@@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE
     \ingroup multimedia
     \inmodule QtMultimediaKit
     \internal
+    \since 1.0
 
     This class implements the audio functionality for
     QAudioDeviceInfo, i.e., QAudioDeviceInfo keeps a
diff --git a/src/multimedia/effects/qsamplecache_p.cpp b/src/multimedia/effects/qsamplecache_p.cpp
index e72cc31820..dff9bc87b5 100644
--- a/src/multimedia/effects/qsamplecache_p.cpp
+++ b/src/multimedia/effects/qsamplecache_p.cpp
@@ -53,6 +53,8 @@ QT_BEGIN_NAMESPACE
 
     When you want to get a sound sample data, you need to request the QSample reference from QSampleCache.
 
+    \since 1.1
+
     \code
         QSample *m_sample;     // class member.
 
diff --git a/src/multimedia/qaudiocapturesource.cpp b/src/multimedia/qaudiocapturesource.cpp
index 5981ee365b..1d70bbe764 100644
--- a/src/multimedia/qaudiocapturesource.cpp
+++ b/src/multimedia/qaudiocapturesource.cpp
@@ -50,8 +50,9 @@ QT_BEGIN_NAMESPACE
     \brief The QAudioCaptureSource class provides an interface to query and select an audio input endpoint.
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
+
 
-    
 
     QAudioCaptureSource provides access to the audio inputs available on your system.
 
diff --git a/src/multimedia/qaudioencodercontrol.cpp b/src/multimedia/qaudioencodercontrol.cpp
index 515156f7ce..fd3bc21f03 100644
--- a/src/multimedia/qaudioencodercontrol.cpp
+++ b/src/multimedia/qaudioencodercontrol.cpp
@@ -49,8 +49,9 @@ QT_BEGIN_NAMESPACE
     \class QAudioEncoderControl
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
+
 
-    
 
     \brief The QAudioEncoderControl class provides access to the settings of a
     media service that performs audio encoding.
diff --git a/src/multimedia/qaudioendpointselector.cpp b/src/multimedia/qaudioendpointselector.cpp
index 1796e80939..cad0b30cb2 100644
--- a/src/multimedia/qaudioendpointselector.cpp
+++ b/src/multimedia/qaudioendpointselector.cpp
@@ -45,10 +45,11 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QAudioEndpointSelector
-    
+
     \brief The QAudioEndpointSelector class provides an audio endpoint selector media control.
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
 
     The QAudioEndpointSelector class provides descriptions of the audio
     endpoints available on a system and allows one to be selected as the audio
diff --git a/src/multimedia/qaudionamespace.qdoc b/src/multimedia/qaudionamespace.qdoc
new file mode 100644
index 0000000000..32ceb5c6ca
--- /dev/null
+++ b/src/multimedia/qaudionamespace.qdoc
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of this
+** file.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+
+/*!
+    \namespace QAudio
+    \brief The QAudio namespace contains enums used by the audio classes.
+    \inmodule QtMultimediaKit
+    \ingroup multimedia
+*/
+
+/*
+    \enum QAudio::Error
+
+    Error states
+
+    \value NoError         No errors have occurred
+    \value OpenError       An error opening the audio device
+    \value IOError         An error occurred during read/write of audio device
+    \value UnderrunError   Audio data is not being fed to the audio device at a fast enough rate
+    \value FatalError      A non-recoverable error has occurred, the audio device is not usable at this time.
+*/
+
+/*
+    \enum QAudio::State
+
+    Audio processing states
+
+    \value ActiveState     Audio data is being processed, this state is set after start() is called
+                           and while audio data is available to be processed.
+    \value SuspendedState  The audio device is in a suspended state, this state will only be entered
+                           after suspend() is called.
+    \value StoppedState    The audio device is closed, not processing any audio data
+    \value IdleState       The QIODevice passed in has no data and audio system's buffer is empty, this state
+                           is set after start() is called and while no audio data is available to be processed.
+*/
+
+/*
+    \enum QAudio::Mode
+
+    Audio I/O modes
+
+    \value AudioOutput   audio output device
+    \value AudioInput    audio input device
+*/
diff --git a/src/multimedia/qcamera.cpp b/src/multimedia/qcamera.cpp
index f942b88f6a..ed526bef05 100644
--- a/src/multimedia/qcamera.cpp
+++ b/src/multimedia/qcamera.cpp
@@ -68,6 +68,7 @@ public:
         qRegisterMetaType<QCamera::Error>("QCamera::Error");
         qRegisterMetaType<QCamera::State>("QCamera::State");
         qRegisterMetaType<QCamera::Status>("QCamera::Status");
+        qRegisterMetaType<QCamera::CaptureMode>("QCamera::CaptureMode");
         qRegisterMetaType<QCamera::LockType>("QCamera::LockType");
         qRegisterMetaType<QCamera::LockStatus>("QCamera::LockStatus");
         qRegisterMetaType<QCamera::LockChangeReason>("QCamera::LockChangeReason");
@@ -84,6 +85,7 @@ public:
 
     \inmodule QtMultimediaKit
     \ingroup camera
+    \since 1.1
 
     QCamera can be used with QVideoWidget for viewfinder display,
     QMediaRecorder for video recording and QCameraImageCapture for image taking.
diff --git a/src/multimedia/qcameracontrol.cpp b/src/multimedia/qcameracontrol.cpp
index 5a8856b5f7..431a4fe68b 100644
--- a/src/multimedia/qcameracontrol.cpp
+++ b/src/multimedia/qcameracontrol.cpp
@@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE
 
     \inmodule QtMultimediaKit
     \ingroup camera
+    \since 1.1
 
     This service is provided by a QMediaService object via
     QMediaService::control().  It is used by QCamera.
diff --git a/src/multimedia/qcameraexposure.cpp b/src/multimedia/qcameraexposure.cpp
index c31fa46f8d..34e02395f3 100644
--- a/src/multimedia/qcameraexposure.cpp
+++ b/src/multimedia/qcameraexposure.cpp
@@ -59,6 +59,7 @@ QT_BEGIN_NAMESPACE
 
     \inmodule QtMultimediaKit
     \ingroup camera
+    \since 1.1
 
 */
 
diff --git a/src/multimedia/qcameraexposurecontrol.cpp b/src/multimedia/qcameraexposurecontrol.cpp
index bb89d4ea7b..2ce98dc895 100644
--- a/src/multimedia/qcameraexposurecontrol.cpp
+++ b/src/multimedia/qcameraexposurecontrol.cpp
@@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE
 
     \inmodule QtMultimediaKit
     \ingroup camera
+    \since 1.1
 
     The interface name of QCameraExposureControl is \c com.nokia.Qt.QCameraExposureControl/1.0 as
     defined in QCameraExposureControl_iid.
diff --git a/src/multimedia/qcameraflashcontrol.cpp b/src/multimedia/qcameraflashcontrol.cpp
index a35d0d16e5..0b548b1a9e 100644
--- a/src/multimedia/qcameraflashcontrol.cpp
+++ b/src/multimedia/qcameraflashcontrol.cpp
@@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE
 
     \ingroup camera
     \inmodule QtMultimediaKit
+    \since 1.1
 
     The interface name of QCameraFlashControl is \c com.nokia.Qt.QCameraFlashControl/1.0 as
     defined in QCameraFlashControl_iid.
diff --git a/src/multimedia/qcamerafocus.cpp b/src/multimedia/qcamerafocus.cpp
index 65a48db624..a67b372333 100644
--- a/src/multimedia/qcamerafocus.cpp
+++ b/src/multimedia/qcamerafocus.cpp
@@ -172,6 +172,7 @@ void QCameraFocusZone::setStatus(QCameraFocusZone::FocusZoneStatus status)
 
     \inmodule QtMultimediaKit
     \ingroup camera
+    \since 1.1
 
 */
 
diff --git a/src/multimedia/qcamerafocuscontrol.cpp b/src/multimedia/qcamerafocuscontrol.cpp
index dc3f900b4a..9ee1720297 100644
--- a/src/multimedia/qcamerafocuscontrol.cpp
+++ b/src/multimedia/qcamerafocuscontrol.cpp
@@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE
 
     \inmodule QtMultimediaKit
     \ingroup camera
+    \since 1.1
 
     The interface name of QCameraFocusControl is \c com.nokia.Qt.QCameraFocusControl/1.0 as
     defined in QCameraFocusControl_iid.
diff --git a/src/multimedia/qcameraimagecapture.cpp b/src/multimedia/qcameraimagecapture.cpp
index fe9bc8d348..0f43adaaf2 100644
--- a/src/multimedia/qcameraimagecapture.cpp
+++ b/src/multimedia/qcameraimagecapture.cpp
@@ -60,8 +60,9 @@ QT_BEGIN_NAMESPACE
     \class QCameraImageCapture
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.1
+
 
-    
     \brief The QCameraImageCapture class is used for the recording of media content.
 
     The QCameraImageCapture class is a high level images recording class.
diff --git a/src/multimedia/qcameraimagecapturecontrol.cpp b/src/multimedia/qcameraimagecapturecontrol.cpp
index cf673a41ec..7d40bb1238 100644
--- a/src/multimedia/qcameraimagecapturecontrol.cpp
+++ b/src/multimedia/qcameraimagecapturecontrol.cpp
@@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE
 
     \inmodule QtMultimediaKit
     \ingroup camera
+    \since 1.1
 
 
 
diff --git a/src/multimedia/qcameraimageprocessing.cpp b/src/multimedia/qcameraimageprocessing.cpp
index df1b17c39c..212425fb44 100644
--- a/src/multimedia/qcameraimageprocessing.cpp
+++ b/src/multimedia/qcameraimageprocessing.cpp
@@ -63,6 +63,7 @@ QT_BEGIN_NAMESPACE
 
     \inmodule QtMultimediaKit
     \ingroup camera
+    \since 1.1
 
 */
 
diff --git a/src/multimedia/qcameraimageprocessingcontrol.cpp b/src/multimedia/qcameraimageprocessingcontrol.cpp
index d79fa374e8..18b3581807 100644
--- a/src/multimedia/qcameraimageprocessingcontrol.cpp
+++ b/src/multimedia/qcameraimageprocessingcontrol.cpp
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
     \class QCameraImageProcessingControl
     \inmodule QtMultimediaKit
     \ingroup multimedia-serv
+    \since 1.1
 
 
     \brief The QCameraImageProcessingControl class provides an abstract class
diff --git a/src/multimedia/qcameralockscontrol.cpp b/src/multimedia/qcameralockscontrol.cpp
index fd2683fe14..bf00d07cdd 100644
--- a/src/multimedia/qcameralockscontrol.cpp
+++ b/src/multimedia/qcameralockscontrol.cpp
@@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE
 
     \inmodule QtMultimediaKit
     \ingroup camera
+    \since 1.1
 
     This service is provided by a QMediaService object via
     QMediaService::control().  It is used by QCamera.
diff --git a/src/multimedia/qcameraviewfinder.cpp b/src/multimedia/qcameraviewfinder.cpp
index 5707e1a0c4..121f05b9cc 100644
--- a/src/multimedia/qcameraviewfinder.cpp
+++ b/src/multimedia/qcameraviewfinder.cpp
@@ -58,6 +58,7 @@ QT_USE_NAMESPACE
 
     \inmodule QtMultimediaKit
     \ingroup camera
+    \since 1.1
 
     \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera
 
diff --git a/src/multimedia/qgraphicsvideoitem.cpp b/src/multimedia/qgraphicsvideoitem.cpp
index ba34f39013..46f0fe7661 100644
--- a/src/multimedia/qgraphicsvideoitem.cpp
+++ b/src/multimedia/qgraphicsvideoitem.cpp
@@ -178,6 +178,7 @@ void QGraphicsVideoItemPrivate::_q_serviceDestroyed()
 
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
 
     Attaching a QGraphicsVideoItem to a QMediaObject allows it to display
     the video or image output of that media object.  A QGraphicsVideoItem
diff --git a/src/multimedia/qimageencodercontrol.cpp b/src/multimedia/qimageencodercontrol.cpp
index ee449dce8c..6442bfdcea 100644
--- a/src/multimedia/qimageencodercontrol.cpp
+++ b/src/multimedia/qimageencodercontrol.cpp
@@ -46,9 +46,10 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QImageEncoderControl
-    
+
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
 
     \brief The QImageEncoderControl class provides access to the settings of a media service that
     performs image encoding.
diff --git a/src/multimedia/qmediabindableinterface.cpp b/src/multimedia/qmediabindableinterface.cpp
index 6f048a9900..56ad751b5c 100644
--- a/src/multimedia/qmediabindableinterface.cpp
+++ b/src/multimedia/qmediabindableinterface.cpp
@@ -47,8 +47,9 @@ QT_BEGIN_NAMESPACE
     \class QMediaBindableInterface
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
+
 
-    
     \brief The QMediaBindableInterface class is the base class for objects extending media objects functionality.
 
     \sa
diff --git a/src/multimedia/qmediacontainercontrol.cpp b/src/multimedia/qmediacontainercontrol.cpp
index e3348a2f2e..3fa4cadb71 100644
--- a/src/multimedia/qmediacontainercontrol.cpp
+++ b/src/multimedia/qmediacontainercontrol.cpp
@@ -46,11 +46,12 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaContainerControl
-    
+
     \brief The QMediaContainerControl class provides access to the output container format of a QMediaService
 
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
 
     If a QMediaService supports writing encoded data it will implement
     QMediaContainerControl.  This control provides information about the output
diff --git a/src/multimedia/qmediacontent.cpp b/src/multimedia/qmediacontent.cpp
index 96f15a73d8..c0516c62bb 100644
--- a/src/multimedia/qmediacontent.cpp
+++ b/src/multimedia/qmediacontent.cpp
@@ -72,11 +72,12 @@ private:
 
 /*!
     \class QMediaContent
-    
+
     \brief The QMediaContent class provides access to the resources relating to a media content.
 
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
 
     QMediaContent is used within the multimedia framework as the logical handle
     to media content.  A QMediaContent object is composed of one or more
diff --git a/src/multimedia/qmediacontrol.cpp b/src/multimedia/qmediacontrol.cpp
index 8a62801c73..55f6e131d8 100644
--- a/src/multimedia/qmediacontrol.cpp
+++ b/src/multimedia/qmediacontrol.cpp
@@ -53,8 +53,9 @@ QT_BEGIN_NAMESPACE
     \class QMediaControl
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
+
 
-    
     \brief The QMediaControl class provides a base interface for media service controls.
 
     Media controls provide an interface to individual features provided by a
diff --git a/src/multimedia/qmediaencodersettings.cpp b/src/multimedia/qmediaencodersettings.cpp
index 5efd076a75..11aef00a14 100644
--- a/src/multimedia/qmediaencodersettings.cpp
+++ b/src/multimedia/qmediaencodersettings.cpp
@@ -87,6 +87,7 @@ private:
 
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
 
     A audio encoder settings object is used to specify the audio encoder
     settings used by QMediaRecorder.  Audio encoder settings are selected by
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
diff --git a/src/multimedia/qmediaimageviewerservice.cpp b/src/multimedia/qmediaimageviewerservice.cpp
index 5aa2cee230..7a374e7125 100644
--- a/src/multimedia/qmediaimageviewerservice.cpp
+++ b/src/multimedia/qmediaimageviewerservice.cpp
@@ -176,6 +176,7 @@ void QMediaImageViewerServicePrivate::clear()
 
 /*!
     \class QMediaImageViewerService
+    \since 1.0
     \internal
 */
 
diff --git a/src/multimedia/qmedianetworkaccesscontrol.cpp b/src/multimedia/qmedianetworkaccesscontrol.cpp
index 2275a69484..847819358d 100644
--- a/src/multimedia/qmedianetworkaccesscontrol.cpp
+++ b/src/multimedia/qmedianetworkaccesscontrol.cpp
@@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE
     \brief The QMediaNetworkAccessControl class allows the setting of the Network Access Point for media related activities.
     \ingroup multimedia
     \inmodule QtMultimediaKit
+    \since 1.2
 
     The functionality provided by this control allows the
     setting of a Network Access Point.
diff --git a/src/multimedia/qmediaobject.cpp b/src/multimedia/qmediaobject.cpp
index 41787d89bd..0dedabcfec 100644
--- a/src/multimedia/qmediaobject.cpp
+++ b/src/multimedia/qmediaobject.cpp
@@ -67,11 +67,12 @@ void QMediaObjectPrivate::_q_notify()
 
 /*!
     \class QMediaObject
-    
+
     \brief The QMediaObject class provides a common base for multimedia objects.
 
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
 
     QMediaObject derived classes provide access to the functionality of a
     QMediaService.  Each media object hosts a QMediaService and uses the
diff --git a/src/multimedia/qmediaplayer.cpp b/src/multimedia/qmediaplayer.cpp
index 1828d07926..8d9a42a937 100644
--- a/src/multimedia/qmediaplayer.cpp
+++ b/src/multimedia/qmediaplayer.cpp
@@ -67,8 +67,9 @@ QT_BEGIN_NAMESPACE
     \brief The QMediaPlayer class allows the playing of a media source.
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
+
 
-    
 
     The QMediaPlayer class is a high level media playback class. It can be used
     to playback such content as songs, movies and internet radio. The content
diff --git a/src/multimedia/qmediaplayercontrol.cpp b/src/multimedia/qmediaplayercontrol.cpp
index 5d0a7bace2..69592d9d9f 100644
--- a/src/multimedia/qmediaplayercontrol.cpp
+++ b/src/multimedia/qmediaplayercontrol.cpp
@@ -50,8 +50,9 @@ QT_BEGIN_NAMESPACE
     \class QMediaPlayerControl
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
+
 
-    
     \brief The QMediaPlayerControl class provides access to the media playing
     functionality of a QMediaService.
 
diff --git a/src/multimedia/qmediaplaylist.cpp b/src/multimedia/qmediaplaylist.cpp
index 94f303c2f4..8ea66f765b 100644
--- a/src/multimedia/qmediaplaylist.cpp
+++ b/src/multimedia/qmediaplaylist.cpp
@@ -66,8 +66,9 @@ Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, playlistIOLoader,
     \class QMediaPlaylist
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
+
 
-    
     \brief The QMediaPlaylist class provides a list of media content to play.
 
     QMediaPlaylist is intended to be used with other media objects,
@@ -105,7 +106,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, playlistIOLoader,
 
 
 /*!
-  Create a new playlist object for with the given \a parent.  
+  Create a new playlist object for with the given \a parent.
 */
 
 QMediaPlaylist::QMediaPlaylist(QObject *parent)
diff --git a/src/multimedia/qmediaplaylistcontrol.cpp b/src/multimedia/qmediaplaylistcontrol.cpp
index 21823e5597..e39222ca11 100644
--- a/src/multimedia/qmediaplaylistcontrol.cpp
+++ b/src/multimedia/qmediaplaylistcontrol.cpp
@@ -49,8 +49,9 @@ QT_BEGIN_NAMESPACE
     \class QMediaPlaylistControl
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
+
 
-    
     \brief The QMediaPlaylistControl class provides access to the playlist
     functionality of a QMediaService.
 
diff --git a/src/multimedia/qmediaplaylistioplugin.cpp b/src/multimedia/qmediaplaylistioplugin.cpp
index 9d4fcc9861..2b91ab823f 100644
--- a/src/multimedia/qmediaplaylistioplugin.cpp
+++ b/src/multimedia/qmediaplaylistioplugin.cpp
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
     
     \brief The QMediaPlaylistReader class provides an interface for reading a playlist file.
     \inmodule QtMultimediaKit
+    \since 1.0
 
     \sa QMediaPlaylistIOPlugin
 */
diff --git a/src/multimedia/qmediaplaylistnavigator.cpp b/src/multimedia/qmediaplaylistnavigator.cpp
index 3d5fe0c664..a66b04e307 100644
--- a/src/multimedia/qmediaplaylistnavigator.cpp
+++ b/src/multimedia/qmediaplaylistnavigator.cpp
@@ -192,9 +192,11 @@ int QMediaPlaylistNavigatorPrivate::previousItemPos(int steps) const
 
 /*!
     \class QMediaPlaylistNavigator
-    
+
     \brief The QMediaPlaylistNavigator class provides navigation for a media playlist.
     \inmodule QtMultimediaKit
+    \ingroup multimedia
+    \since 1.0
 
     \sa QMediaPlaylist, QMediaPlaylistProvider
 */
diff --git a/src/multimedia/qmediaplaylistprovider.cpp b/src/multimedia/qmediaplaylistprovider.cpp
index 1564b3e9a7..8b821d3854 100644
--- a/src/multimedia/qmediaplaylistprovider.cpp
+++ b/src/multimedia/qmediaplaylistprovider.cpp
@@ -48,9 +48,10 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaPlaylistProvider
-    
+
     \brief The QMediaPlaylistProvider class provides an abstract list of media.
     \inmodule QtMultimediaKit
+    \since 1.0
 
     \sa QMediaPlaylist
 */
diff --git a/src/multimedia/qmediaplaylistsourcecontrol.cpp b/src/multimedia/qmediaplaylistsourcecontrol.cpp
index 2db83a88c6..24028d34e4 100644
--- a/src/multimedia/qmediaplaylistsourcecontrol.cpp
+++ b/src/multimedia/qmediaplaylistsourcecontrol.cpp
@@ -49,8 +49,9 @@ QT_BEGIN_NAMESPACE
     \class QMediaPlaylistSourceControl
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
+
 
-    
     \brief The QMediaPlaylistSourceControl class provides access to the playlist playback
     functionality of a QMediaService.
 
diff --git a/src/multimedia/qmediarecorder.cpp b/src/multimedia/qmediarecorder.cpp
index 51918f3eca..d9edffd416 100644
--- a/src/multimedia/qmediarecorder.cpp
+++ b/src/multimedia/qmediarecorder.cpp
@@ -65,8 +65,9 @@ QT_BEGIN_NAMESPACE
     \class QMediaRecorder
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
+
 
-    
     \brief The QMediaRecorder class is used for the recording of media content.
 
     The QMediaRecorder class is a high level media recording class.  It's not
@@ -320,7 +321,7 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object)
 
                 connect(service, SIGNAL(destroyed()), this, SLOT(_q_serviceDestroyed()));
 
-                
+
                 return true;
             }
         }
diff --git a/src/multimedia/qmediarecordercontrol.cpp b/src/multimedia/qmediarecordercontrol.cpp
index 0f6c60fafb..57306e110e 100644
--- a/src/multimedia/qmediarecordercontrol.cpp
+++ b/src/multimedia/qmediarecordercontrol.cpp
@@ -48,8 +48,9 @@ QT_BEGIN_NAMESPACE
     \class QMediaRecorderControl
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
+
 
-    
     \brief The QMediaRecorderControl class provides access to the recording
     functionality of a QMediaService.
 
diff --git a/src/multimedia/qmediaresource.cpp b/src/multimedia/qmediaresource.cpp
index 22163d251c..c907a6047d 100644
--- a/src/multimedia/qmediaresource.cpp
+++ b/src/multimedia/qmediaresource.cpp
@@ -49,10 +49,11 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaResource
-    
+
     \brief The QMediaResource class provides a description of a media resource.
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
 
     A media resource is composed of a \l {url()}{URL} containing the
     location of the resource and a set of properties that describe the
diff --git a/src/multimedia/qmediaservice.cpp b/src/multimedia/qmediaservice.cpp
index fedabddcb0..22eb8a93ee 100644
--- a/src/multimedia/qmediaservice.cpp
+++ b/src/multimedia/qmediaservice.cpp
@@ -55,7 +55,8 @@ QT_BEGIN_NAMESPACE
     service implementations.
     \inmodule QtMultimediaKit
     \ingroup multimedia
-    
+    \since 1.0
+
 
     Media services provide implementations of the functionality promised
     by media objects, and allow multiple providers to implement a QMediaObject.
diff --git a/src/multimedia/qmediaserviceprovider.cpp b/src/multimedia/qmediaserviceprovider.cpp
index 1e87750b0b..12389102f3 100644
--- a/src/multimedia/qmediaserviceprovider.cpp
+++ b/src/multimedia/qmediaserviceprovider.cpp
@@ -81,11 +81,12 @@ public:
 
 /*!
     \class QMediaServiceProviderHint
-    
+
     \brief The QMediaServiceProviderHint class describes what is required of a QMediaService.
 
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
 
     The QMediaServiceProvider class uses hints to select an appropriate media service.
 */
@@ -523,7 +524,7 @@ Q_GLOBAL_STATIC(QPluginServiceProvider, pluginProvider);
 
 /*!
     \class QMediaServiceProvider
-    
+
     \brief The QMediaServiceProvider class provides an abstract allocator for media services.
 */
 
@@ -637,7 +638,7 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider()
 
 /*!
     \class QMediaServiceProviderPlugin
-    
+
     \brief The QMediaServiceProviderPlugin class interface provides an interface for QMediaService
     plug-ins.
 
diff --git a/src/multimedia/qmediastreamscontrol.cpp b/src/multimedia/qmediastreamscontrol.cpp
index aa0efd71eb..7b0c0a04a5 100644
--- a/src/multimedia/qmediastreamscontrol.cpp
+++ b/src/multimedia/qmediastreamscontrol.cpp
@@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE
     \brief The QMediaStreamsControl class provides a media stream selection control.
 
     \ingroup multimedia
+    \since 1.0
 
     The QMediaStreamsControl class provides descriptions of the available media streams
     and allows individual streams to be activated and deactivated.
diff --git a/src/multimedia/qmediatimerange.cpp b/src/multimedia/qmediatimerange.cpp
index dd5cb4ce6f..8ff7d0c190 100644
--- a/src/multimedia/qmediatimerange.cpp
+++ b/src/multimedia/qmediatimerange.cpp
@@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE
     \brief The QMediaTimeInterval class represents a time interval with integer precision.
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
 
     An interval is specified by an inclusive start() and end() time.  These
     must be set in the constructor, as this is an immutable class.  The
@@ -240,7 +241,7 @@ QMediaTimeRangePrivate::QMediaTimeRangePrivate(const QMediaTimeInterval &interva
 }
 
 void QMediaTimeRangePrivate::addInterval(const QMediaTimeInterval &interval)
-{    
+{
     // Handle normalized intervals only
     if(!interval.isNormal())
         return;
diff --git a/src/multimedia/qmetadatareadercontrol.cpp b/src/multimedia/qmetadatareadercontrol.cpp
index 70d06d20fb..cfc3bf8ac8 100644
--- a/src/multimedia/qmetadatareadercontrol.cpp
+++ b/src/multimedia/qmetadatareadercontrol.cpp
@@ -49,8 +49,9 @@ QT_BEGIN_NAMESPACE
     \class QMetaDataReaderControl
     \inmodule QtMultimediaKit
     \ingroup multimedia-serv
+    \since 1.0
+
 
-    
     \brief The QMetaDataReaderControl class provides read access to the
     meta-data of a QMediaService's media.
 
diff --git a/src/multimedia/qmetadatawritercontrol.cpp b/src/multimedia/qmetadatawritercontrol.cpp
index 812a9d0a88..6b9acde710 100644
--- a/src/multimedia/qmetadatawritercontrol.cpp
+++ b/src/multimedia/qmetadatawritercontrol.cpp
@@ -49,8 +49,9 @@ QT_BEGIN_NAMESPACE
     \class QMetaDataWriterControl
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
+
 
-    
     \brief The QMetaDataWriterControl class provides write access to the
     meta-data of a QMediaService's media.
 
diff --git a/src/multimedia/qpaintervideosurface.cpp b/src/multimedia/qpaintervideosurface.cpp
index 6212d0ecbd..275259512d 100644
--- a/src/multimedia/qpaintervideosurface.cpp
+++ b/src/multimedia/qpaintervideosurface.cpp
@@ -1280,6 +1280,7 @@ QAbstractVideoSurface::Error QVideoSurfaceGlslPainter::paint(
 
 /*!
     \class QPainterVideoSurface
+    \since 1.0
     \internal
 */
 
@@ -1387,7 +1388,7 @@ bool QPainterVideoSurface::present(const QVideoFrame &frame)
     if (!m_ready) {
         if (!isActive())
             setError(StoppedError);
-    } else if (frame.isValid() 
+    } else if (frame.isValid()
             && (frame.pixelFormat() != m_pixelFormat || frame.size() != m_frameSize)) {
         setError(IncorrectFormatError);
 
diff --git a/src/multimedia/qradiotuner.cpp b/src/multimedia/qradiotuner.cpp
index 0b9e91b277..24954c6dcc 100644
--- a/src/multimedia/qradiotuner.cpp
+++ b/src/multimedia/qradiotuner.cpp
@@ -55,6 +55,7 @@ QT_BEGIN_NAMESPACE
 
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
 
     You can control the systems analog radio device using this interface, for example:
 
diff --git a/src/multimedia/qradiotunercontrol.cpp b/src/multimedia/qradiotunercontrol.cpp
index 06d0c38c24..3361443382 100644
--- a/src/multimedia/qradiotunercontrol.cpp
+++ b/src/multimedia/qradiotunercontrol.cpp
@@ -50,8 +50,9 @@ QT_BEGIN_NAMESPACE
     \class QRadioTunerControl
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
+
 
-    
     \brief The QRadioTunerControl class provides access to the radio tuning
     functionality of a QMediaService.
 
diff --git a/src/multimedia/qvideodevicecontrol.cpp b/src/multimedia/qvideodevicecontrol.cpp
index c46cae1104..1d2b185b9b 100644
--- a/src/multimedia/qvideodevicecontrol.cpp
+++ b/src/multimedia/qvideodevicecontrol.cpp
@@ -45,10 +45,11 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QVideoDeviceControl
-    
+
     \brief The QVideoDeviceControl class provides an video device selector media control.
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
 
     The QVideoDeviceControl class provides descriptions of the video devices
     available on a system and allows one to be selected as the  endpoint of a
diff --git a/src/multimedia/qvideoencodercontrol.cpp b/src/multimedia/qvideoencodercontrol.cpp
index 97ae4b2329..ef999e8d67 100644
--- a/src/multimedia/qvideoencodercontrol.cpp
+++ b/src/multimedia/qvideoencodercontrol.cpp
@@ -47,9 +47,10 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QVideoEncoderControl
-    
+
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
 
     \brief The QVideoEncoderControl class provides access to the settings
     of a media service that performs video encoding.
diff --git a/src/multimedia/qvideorenderercontrol.cpp b/src/multimedia/qvideorenderercontrol.cpp
index 10f41539b5..4f6e7a51e5 100644
--- a/src/multimedia/qvideorenderercontrol.cpp
+++ b/src/multimedia/qvideorenderercontrol.cpp
@@ -47,13 +47,14 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QVideoRendererControl
-    
+
 
     \brief The QVideoRendererControl class provides a control for rendering
     to a video surface.
 
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
 
     Using the surface() property of QVideoRendererControl a
     QAbstractVideoSurface may be set as the video render target of a
diff --git a/src/multimedia/qvideowidget.cpp b/src/multimedia/qvideowidget.cpp
index a738d39f87..6056b774a5 100644
--- a/src/multimedia/qvideowidget.cpp
+++ b/src/multimedia/qvideowidget.cpp
@@ -591,6 +591,7 @@ void QVideoWidgetPrivate::_q_dimensionsChanged()
     produced by a media object.
     \ingroup multimedia
     \inmodule QtMultimediaKit
+    \since 1.0
 
     Attaching a QVideoWidget to a QMediaObject allows it to display the
     video or image output of that media object.  A QVideoWidget is attached
diff --git a/src/multimedia/qvideowidgetcontrol.cpp b/src/multimedia/qvideowidgetcontrol.cpp
index 0e6a96b2cd..f40a7960ae 100644
--- a/src/multimedia/qvideowidgetcontrol.cpp
+++ b/src/multimedia/qvideowidgetcontrol.cpp
@@ -46,13 +46,14 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QVideoWidgetControl
-    
+
 
     \brief The QVideoWidgetControl class provides a media control which
     implements a video widget.
 
     \inmodule QtMultimediaKit
     \ingroup multimedia
+    \since 1.0
 
     The videoWidget() property of QVideoWidgetControl provides a pointer to a
     video widget implemented by the control's media service.  This widget is
diff --git a/src/multimedia/qvideowindowcontrol.cpp b/src/multimedia/qvideowindowcontrol.cpp
index cdc2b8934a..7c1202b614 100644
--- a/src/multimedia/qvideowindowcontrol.cpp
+++ b/src/multimedia/qvideowindowcontrol.cpp
@@ -45,10 +45,11 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QVideoWindowControl
-    
+
     \inmodule QtMultimediaKit
     \ingroup multimedia
     \brief The QVideoWindowControl class provides a media control for rendering video to a window.
+    \since 1.0
 
 
     The winId() property QVideoWindowControl allows a platform specific window
diff --git a/src/multimedia/video/qmemoryvideobuffer.cpp b/src/multimedia/video/qmemoryvideobuffer.cpp
index 983d31ac94..242d1d05d1 100644
--- a/src/multimedia/video/qmemoryvideobuffer.cpp
+++ b/src/multimedia/video/qmemoryvideobuffer.cpp
@@ -64,6 +64,7 @@ public:
     \class QMemoryVideoBuffer
     \brief The QMemoryVideoBuffer class provides a system memory allocated video data buffer.
     \internal
+    \since QtMobility 1.0
 
     QMemoryVideoBuffer is the default video buffer for allocating system memory.  It may be used to
     allocate memory for a QVideoFrame without implementing your own QAbstractVideoBuffer.