Remove the usage of deprecated qdoc macros.

QDoc now has support for Doxygen style commands for italics, bold
and list items. This change applies that change in QDoc to the
actual documentation.

Task-number: QTBUG-24578
Change-Id: Iec1c616e0d9a915a31a661916805916e19495dc9
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

21 files changed, 267 insertions, 267 deletions

diff --git a/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp b/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp
index 1b7e33e23..4d2fca3a3 100644
--- a/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp
+++ b/src/imports/audioengine/qdeclarative_attenuationmodel_p.cpp
@@ -99,7 +99,7 @@ void QDeclarativeAttenuationModel::setName(const QString& name)
     \inherits Item
     \preliminary
 
-    This element is part of the \bold{QtAudioEngine 1.0} module.
+    This element is part of the \b{QtAudioEngine 1.0} module.
 
     AttenuationModelLinear must be defined inside AudioEngine.
 
@@ -231,7 +231,7 @@ qreal QDeclarativeAttenuationModelLinear::calculateGain(const QVector3D &listene
     \inherits Item
     \preliminary
 
-    This element is part of the \bold{QtAudioEngine 1.0} module.
+    This element is part of the \b{QtAudioEngine 1.0} module.
 
     AttenuationModelInverse must be defined inside AudioEngine.
 
diff --git a/src/imports/audioengine/qdeclarative_audiocategory_p.cpp b/src/imports/audioengine/qdeclarative_audiocategory_p.cpp
index 29a445aa5..e34541728 100644
--- a/src/imports/audioengine/qdeclarative_audiocategory_p.cpp
+++ b/src/imports/audioengine/qdeclarative_audiocategory_p.cpp
@@ -55,7 +55,7 @@ QT_USE_NAMESPACE
     \inherits Item
     \preliminary
 
-    This element is part of the \bold{QtAudioEngine 1.0} module.
+    This element is part of the \b{QtAudioEngine 1.0} module.
 
     AudioCategory element can be accessed through QtAudioEngine1::AudioEngine::categories with its
     unique name and must be defined inside AudioEngine.
diff --git a/src/imports/audioengine/qdeclarative_audioengine_p.cpp b/src/imports/audioengine/qdeclarative_audioengine_p.cpp
index 1424c6904..7c025a554 100644
--- a/src/imports/audioengine/qdeclarative_audioengine_p.cpp
+++ b/src/imports/audioengine/qdeclarative_audioengine_p.cpp
@@ -64,7 +64,7 @@ QT_USE_NAMESPACE
     \inherits Item
     \preliminary
 
-    This element is part of the \bold{QtAudioEngine 1.0} module.
+    This element is part of the \b{QtAudioEngine 1.0} module.
 
     \qml
     import QtQuick 2.0
diff --git a/src/imports/audioengine/qdeclarative_audiolistener_p.cpp b/src/imports/audioengine/qdeclarative_audiolistener_p.cpp
index 96fcce250..ea269053a 100644
--- a/src/imports/audioengine/qdeclarative_audiolistener_p.cpp
+++ b/src/imports/audioengine/qdeclarative_audiolistener_p.cpp
@@ -56,7 +56,7 @@ QT_USE_NAMESPACE
     \inherits Item
     \preliminary
 
-    This element is part of the \bold{QtAudioEngine 1.0} module.
+    This element is part of the \b{QtAudioEngine 1.0} module.
 
     AudioListener will have only one global instance and you can either access it through the
     listener property of AudioEngine:
diff --git a/src/imports/audioengine/qdeclarative_audiosample_p.cpp b/src/imports/audioengine/qdeclarative_audiosample_p.cpp
index 83c818529..48427049f 100644
--- a/src/imports/audioengine/qdeclarative_audiosample_p.cpp
+++ b/src/imports/audioengine/qdeclarative_audiosample_p.cpp
@@ -58,7 +58,7 @@ QT_USE_NAMESPACE
     \inherits Item
     \preliminary
 
-    This element is part of the \bold{QtAudioEngine 1.0} module.
+    This element is part of the \b{QtAudioEngine 1.0} module.
 
     AudioSample element can be accessed through QtAudioEngine1::AudioEngine::samples with its unique
     name and must be defined inside AudioEngine.
diff --git a/src/imports/audioengine/qdeclarative_playvariation_p.cpp b/src/imports/audioengine/qdeclarative_playvariation_p.cpp
index edf2a87ed..f46170689 100644
--- a/src/imports/audioengine/qdeclarative_playvariation_p.cpp
+++ b/src/imports/audioengine/qdeclarative_playvariation_p.cpp
@@ -60,7 +60,7 @@ QT_USE_NAMESPACE
     \inherits Item
     \preliminary
 
-    This element is part of the \bold{QtAudioEngine 1.0} module.
+    This element is part of the \b{QtAudioEngine 1.0} module.
 
     PlayVariation must be defined inside \l Sound element.
 
diff --git a/src/imports/audioengine/qdeclarative_sound_p.cpp b/src/imports/audioengine/qdeclarative_sound_p.cpp
index 81b3ec8ec..37980c117 100644
--- a/src/imports/audioengine/qdeclarative_sound_p.cpp
+++ b/src/imports/audioengine/qdeclarative_sound_p.cpp
@@ -147,7 +147,7 @@ void QDeclarativeSoundCone::componentComplete()
     \inherits Item
     \preliminary
 
-    This element is part of the \bold{QtAudioEngine 1.0} module.
+    This element is part of the \b{QtAudioEngine 1.0} module.
 
     Sound element can be accessed through QtAudioEngine1::AudioEngine::sounds with its unique name
     and must be defined inside AudioEngine.
@@ -232,8 +232,8 @@ void QDeclarativeSound::componentComplete()
     This property holds the playType.  It can be one of:
 
     \list
-    \o Random - randomly picks up a play variation when playback is triggered
-    \o Sequential - plays each variation in sequence when playback is triggered
+    \li Random - randomly picks up a play variation when playback is triggered
+    \li Sequential - plays each variation in sequence when playback is triggered
     \endlist
 
     The default value is Random.
diff --git a/src/imports/audioengine/qdeclarative_soundinstance_p.cpp b/src/imports/audioengine/qdeclarative_soundinstance_p.cpp
index 0ca9d1944..38cffae72 100644
--- a/src/imports/audioengine/qdeclarative_soundinstance_p.cpp
+++ b/src/imports/audioengine/qdeclarative_soundinstance_p.cpp
@@ -59,7 +59,7 @@ QT_USE_NAMESPACE
     \inherits Item
     \preliminary
 
-    This element is part of the \bold{QtAudioEngine 1.0} module.
+    This element is part of the \b{QtAudioEngine 1.0} module.
 
     There are two ways to create SoundInstance objects. You can obtain it by calling newInstance
     method of Sound element:
@@ -298,9 +298,9 @@ void QDeclarativeSoundInstance::dropInstance()
     This property holds the current playback state. It can be one of:
 
     \list
-    \o StopppedState
-    \o PlayingState
-    \o PausedState
+    \li StopppedState
+    \li PlayingState
+    \li PausedState
     \endlist
 */
 QDeclarativeSoundInstance::State QDeclarativeSoundInstance::state() const
diff --git a/src/imports/multimedia/Video.qml b/src/imports/multimedia/Video.qml
index b9d01ff27..bef20a94b 100644
--- a/src/imports/multimedia/Video.qml
+++ b/src/imports/multimedia/Video.qml
@@ -95,10 +95,10 @@ Item {
         area.
 
         \list
-        \o VideoOutput.Stretch - the video is scaled to fit
-        \o VideoOutput.PreserveAspectFit - the video is scaled uniformly to fit without
+        \li VideoOutput.Stretch - the video is scaled to fit
+        \li VideoOutput.PreserveAspectFit - the video is scaled uniformly to fit without
             cropping
-        \o VideoOuput.PreserveAspectCrop - the video is scaled uniformly to fill, cropping
+        \li VideoOuput.PreserveAspectCrop - the video is scaled uniformly to fill, cropping
             if necessary
         \endlist
 
@@ -127,9 +127,9 @@ Item {
         This read only property indicates the playback state of the media.
 
         \list
-        \o MediaPlayer.PlayingState - the media is playing
-        \o MediaPlayer.PausedState - the media is paused
-        \o MediaPlayer.StoppedState - the media is stopped
+        \li MediaPlayer.PlayingState - the media is playing
+        \li MediaPlayer.PausedState - the media is paused
+        \li MediaPlayer.StoppedState - the media is stopped
         \endlist
 
         The default state is MediaPlayer.StoppedState.
@@ -171,14 +171,14 @@ Item {
         This property holds the error state of the video.  It can be one of:
 
         \list
-        \o NoError - there is no current error.
-        \o ResourceError - the video cannot be played due to a problem
+        \li NoError - there is no current error.
+        \li ResourceError - the video cannot be played due to a problem
             allocating resources.
-        \o FormatError - the video format is not supported.
-        \o NetworkError - the video cannot be played due to network issues.
-        \o AccessDenied - the video cannot be played due to insufficient
+        \li FormatError - the video format is not supported.
+        \li NetworkError - the video cannot be played due to network issues.
+        \li AccessDenied - the video cannot be played due to insufficient
             permissions.
-        \o ServiceMissing -  the video cannot be played because the media
+        \li ServiceMissing -  the video cannot be played because the media
             service could not be
         instantiated.
         \endlist
@@ -252,15 +252,15 @@ Item {
         This property holds the status of media loading. It can be one of:
 
         \list
-        \o NoMedia - no media has been set.
-        \o Loading - the media is currently being loaded.
-        \o Loaded - the media has been loaded.
-        \o Buffering - the media is buffering data.
-        \o Stalled - playback has been interrupted while the media is buffering data.
-        \o Buffered - the media has buffered data.
-        \o EndOfMedia - the media has played to the end.
-        \o InvalidMedia - the media cannot be played.
-        \o UnknownStatus - the status of the media cannot be determined.
+        \li NoMedia - no media has been set.
+        \li Loading - the media is currently being loaded.
+        \li Loaded - the media has been loaded.
+        \li Buffering - the media is buffering data.
+        \li Stalled - playback has been interrupted while the media is buffering data.
+        \li Buffered - the media has buffered data.
+        \li EndOfMedia - the media has played to the end.
+        \li InvalidMedia - the media cannot be played.
+        \li UnknownStatus - the status of the media cannot be determined.
         \endlist
     */
     property alias status:          player.status
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index 0cc21f272..6d5661009 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
     \inqmlmodule QtMultimedia 5
     \ingroup multimedia_qml
 
-    This element is part of the \bold{QtMultimedia 5.0} module.
+    This element is part of the \b{QtMultimedia 5.0} module.
 
     \qml
     import QtQuick 2.0
@@ -111,7 +111,7 @@ QT_BEGIN_NAMESPACE
     \inqmlmodule QtMultimedia 5
     \ingroup multimedia_qml
 
-    This element is part of the \bold{QtMultimedia 5.0} module.
+    This element is part of the \b{QtMultimedia 5.0} module.
 
     \qml
     import QtQuick 2.0
@@ -256,15 +256,15 @@ void QDeclarativeAudio::stop()
     This property holds the status of media loading. It can be one of:
 
     \list
-    \o NoMedia - no media has been set.
-    \o Loading - the media is currently being loaded.
-    \o Loaded - the media has been loaded.
-    \o Buffering - the media is buffering data.
-    \o Stalled - playback has been interrupted while the media is buffering data.
-    \o Buffered - the media has buffered data.
-    \o EndOfMedia - the media has played to the end.
-    \o InvalidMedia - the media cannot be played.
-    \o UnknownStatus - the status of the media is unknown.
+    \li NoMedia - no media has been set.
+    \li Loading - the media is currently being loaded.
+    \li Loaded - the media has been loaded.
+    \li Buffering - the media is buffering data.
+    \li Stalled - playback has been interrupted while the media is buffering data.
+    \li Buffered - the media has buffered data.
+    \li EndOfMedia - the media has played to the end.
+    \li InvalidMedia - the media cannot be played.
+    \li UnknownStatus - the status of the media is unknown.
     \endlist
 */
 
@@ -280,9 +280,9 @@ QDeclarativeAudio::Status QDeclarativeAudio::status() const
     This property holds the state of media playback. It can be one of:
 
     \list
-    \o PlayingState - the media is currently playing.
-    \o PausedState - playback of the media has been suspended.
-    \o StoppedState - playback of the media is yet to begin.
+    \li PlayingState - the media is currently playing.
+    \li PausedState - playback of the media has been suspended.
+    \li StoppedState - playback of the media is yet to begin.
     \endlist
 */
 
@@ -376,12 +376,12 @@ bool QDeclarativeAudio::hasVideo() const
     This property holds the error state of the audio.  It can be one of:
 
     \list
-    \o NoError - there is no current error.
-    \o ResourceError - the audio cannot be played due to a problem allocating resources.
-    \o FormatError - the audio format is not supported.
-    \o NetworkError - the audio cannot be played due to network issues.
-    \o AccessDenied - the audio cannot be played due to insufficient permissions.
-    \o ServiceMissing -  the audio cannot be played because the media service could not be
+    \li NoError - there is no current error.
+    \li ResourceError - the audio cannot be played due to a problem allocating resources.
+    \li FormatError - the audio format is not supported.
+    \li NetworkError - the audio cannot be played due to network issues.
+    \li AccessDenied - the audio cannot be played due to insufficient permissions.
+    \li ServiceMissing -  the audio cannot be played because the media service could not be
     instantiated.
     \endlist
 */
diff --git a/src/imports/multimedia/qdeclarativeaudio_4.cpp b/src/imports/multimedia/qdeclarativeaudio_4.cpp
index 094a264fc..d157cf7ad 100644
--- a/src/imports/multimedia/qdeclarativeaudio_4.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio_4.cpp
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 
     \ingroup multimedia_qml
 
-    This element is part of the \bold{QtMultimedia 5.0} module.
+    This element is part of the \b{QtMultimedia 5.0} module.
 
     \qml
     import QtQuick 2.0
@@ -215,15 +215,15 @@ void QDeclarativeAudio_4::stop()
     This property holds the status of media loading. It can be one of:
 
     \list
-    \o NoMedia - no media has been set.
-    \o Loading - the media is currently being loaded.
-    \o Loaded - the media has been loaded.
-    \o Buffering - the media is buffering data.
-    \o Stalled - playback has been interrupted while the media is buffering data.
-    \o Buffered - the media has buffered data.
-    \o EndOfMedia - the media has played to the end.
-    \o InvalidMedia - the media cannot be played.
-    \o UnknownStatus - the status of the media is unknown.
+    \li NoMedia - no media has been set.
+    \li Loading - the media is currently being loaded.
+    \li Loaded - the media has been loaded.
+    \li Buffering - the media is buffering data.
+    \li Stalled - playback has been interrupted while the media is buffering data.
+    \li Buffered - the media has buffered data.
+    \li EndOfMedia - the media has played to the end.
+    \li InvalidMedia - the media cannot be played.
+    \li UnknownStatus - the status of the media is unknown.
     \endlist
 */
 
@@ -309,12 +309,12 @@ bool QDeclarativeAudio_4::hasVideo() const
     This property holds the error state of the audio.  It can be one of:
 
     \list
-    \o NoError - there is no current error.
-    \o ResourceError - the audio cannot be played due to a problem allocating resources.
-    \o FormatError - the audio format is not supported.
-    \o NetworkError - the audio cannot be played due to network issues.
-    \o AccessDenied - the audio cannot be played due to insufficient permissions.
-    \o ServiceMissing -  the audio cannot be played because the media service could not be
+    \li NoError - there is no current error.
+    \li ResourceError - the audio cannot be played due to a problem allocating resources.
+    \li FormatError - the audio format is not supported.
+    \li NetworkError - the audio cannot be played due to network issues.
+    \li AccessDenied - the audio cannot be played due to insufficient permissions.
+    \li ServiceMissing -  the audio cannot be played because the media service could not be
     instantiated.
     \endlist
 */
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp
index f7c247f2a..b6d2583d9 100644
--- a/src/imports/multimedia/qdeclarativecamera.cpp
+++ b/src/imports/multimedia/qdeclarativecamera.cpp
@@ -77,7 +77,7 @@ void QDeclarativeCamera::_q_updateState(QCamera::State state)
 
     \inherits Item
 
-    This element is part of the \bold{QtMultimedia 5.0} module.
+    This element is part of the \b{QtMultimedia 5.0} module.
 
     You can use the \c Camera element to capture images and movies from a camera, and manipulate
     the capture and processing settings that get applied to the images.  To display the
@@ -121,19 +121,19 @@ void QDeclarativeCamera::_q_updateState(QCamera::State state)
     across a few different child properties of Camera.
 
     \table
-    \header \o Property \o Description
-    \row \o \l {CameraCapture} {imageCapture}
-         \o Methods and properties for capturing still images.
-    \row \o \l {CameraRecorder} {videoRecording}
-         \o Methods and properties for capturing movies.
-    \row \o \l {CameraExposure} {exposure}
-         \o Methods and properties for adjusting exposure (aperture, shutter speed etc).
-    \row \o \l {CameraFocus} {focus}
-         \o Methods and properties for adjusting focus and providing feedback on autofocus progress.
-    \row \o \l {CameraFlash} {flash}
-         \o Methods and properties for controlling the camera flash.
-    \row \o \l {CameraImageProcessing} {imageProcessing}
-         \o Methods and properties for adjusting camera image processing parameters.
+    \header \li Property \li Description
+    \row \li \l {CameraCapture} {imageCapture}
+         \li Methods and properties for capturing still images.
+    \row \li \l {CameraRecorder} {videoRecording}
+         \li Methods and properties for capturing movies.
+    \row \li \l {CameraExposure} {exposure}
+         \li Methods and properties for adjusting exposure (aperture, shutter speed etc).
+    \row \li \l {CameraFocus} {focus}
+         \li Methods and properties for adjusting focus and providing feedback on autofocus progress.
+    \row \li \l {CameraFlash} {flash}
+         \li Methods and properties for controlling the camera flash.
+    \row \li \l {CameraImageProcessing} {imageProcessing}
+         \li Methods and properties for adjusting camera image processing parameters.
     \endtable
 
     Basic camera state management, error reporting, and simple zoom properties are
@@ -221,12 +221,12 @@ QString QDeclarativeCamera::errorString() const
     \qmlproperty enumeration QtMultimedia5::Camera::captureMode
 
     \table
-    \header \o Value \o Description
-    \row \o CaptureStillImage
-         \o Prepares the camera element for capturing still images.
+    \header \li Value \li Description
+    \row \li CaptureStillImage
+         \li Prepares the camera element for capturing still images.
 
-    \row \o CaptureVideo
-         \o Prepares the camera element for capturing video.
+    \row \li CaptureVideo
+         \li Prepares the camera element for capturing video.
 
     \endtable
 
@@ -248,9 +248,9 @@ void QDeclarativeCamera::setCaptureMode(QDeclarativeCamera::CaptureMode mode)
     The current state of the camera object.
 
     \table
-    \header \o Value \o Description
-    \row \o UnloadedState
-         \o The initial camera state, with the camera not loaded.
+    \header \li Value \li Description
+    \row \li UnloadedState
+         \li The initial camera state, with the camera not loaded.
            The camera capabilities (with the exception of supported capture modes)
            are unknown. This state saves the most power, but takes the longest
            time to be ready for capture.
@@ -259,16 +259,16 @@ void QDeclarativeCamera::setCaptureMode(QDeclarativeCamera::CaptureMode mode)
            you can still set the camera capture settings like codec,
            resolution, or frame rate.
 
-    \row \o LoadedState
-         \o The camera is loaded and ready to be configured.
+    \row \li LoadedState
+         \li The camera is loaded and ready to be configured.
 
            In the Idle state you can query camera capabilities,
            set capture resolution, codecs, and so on.
 
            The viewfinder is not active in the loaded state.
 
-    \row \o ActiveState
-          \o In the active state the viewfinder frames are available
+    \row \li ActiveState
+          \li In the active state the viewfinder frames are available
              and the camera is ready for capture.
     \endtable
 
@@ -331,18 +331,18 @@ void QDeclarativeCamera::stop()
     The overall status for all the requested camera locks.
 
     \table
-    \header \o Value \o Description
-    \row \o Unlocked
-        \o The application is not interested in camera settings value.
+    \header \li Value \li Description
+    \row \li Unlocked
+        \li The application is not interested in camera settings value.
         The camera may keep this parameter without changes, this is common with camera focus,
         or adjust exposure and white balance constantly to keep the viewfinder image nice.
 
-    \row \o Searching
-        \o The application has requested the camera focus, exposure or white balance lock with
+    \row \li Searching
+        \li The application has requested the camera focus, exposure or white balance lock with
         searchAndLock(). This state indicates the camera is focusing or calculating exposure and white balance.
 
-    \row \o Locked
-        \o The camera focus, exposure or white balance is locked.
+    \row \li Locked
+        \li The camera focus, exposure or white balance is locked.
         The camera is ready to capture, application may check the exposure parameters.
 
         The locked state usually means the requested parameter stays the same,
@@ -357,18 +357,18 @@ void QDeclarativeCamera::stop()
     The overall status for all the requested camera locks.
 
     \table
-    \header \o Value \o Description
-    \row \o Unlocked
-        \o The application is not interested in camera settings value.
+    \header \li Value \li Description
+    \row \li Unlocked
+        \li The application is not interested in camera settings value.
         The camera may keep this parameter without changes, this is common with camera focus,
         or adjust exposure and white balance constantly to keep the viewfinder image nice.
 
-    \row \o Searching
-        \o The application has requested the camera focus, exposure or white balance lock with
+    \row \li Searching
+        \li The application has requested the camera focus, exposure or white balance lock with
         searchAndLock(). This state indicates the camera is focusing or calculating exposure and white balance.
 
-    \row \o Locked
-        \o The camera focus, exposure or white balance is locked.
+    \row \li Locked
+        \li The camera focus, exposure or white balance is locked.
         The camera is ready to capture, application may check the exposure parameters.
 
         The locked state usually means the requested parameter stays the same,
@@ -471,12 +471,12 @@ void QDeclarativeCamera::setDigitalZoom(qreal value)
     values defined below, and a descriptive string value is available in \a errorString.
 
     \table
-    \header \o Value \o Description
-    \row \o NoError \o No errors have occurred.
-    \row \o CameraError \o An error has occurred.
-    \row \o InvalidRequestError \o System resource doesn't support requested functionality.
-    \row \o ServiceMissingError \o No camera service available.
-    \row \o NotSupportedFeatureError \o The feature is not supported.
+    \header \li Value \li Description
+    \row \li NoError \li No errors have occurred.
+    \row \li CameraError \li An error has occurred.
+    \row \li InvalidRequestError \li System resource doesn't support requested functionality.
+    \row \li ServiceMissingError \li No camera service available.
+    \row \li NotSupportedFeatureError \li The feature is not supported.
     \endtable
 */
 
diff --git a/src/imports/multimedia/qdeclarativecameraexposure.cpp b/src/imports/multimedia/qdeclarativecameraexposure.cpp
index 693f3ce5b..dc433ec7a 100644
--- a/src/imports/multimedia/qdeclarativecameraexposure.cpp
+++ b/src/imports/multimedia/qdeclarativecameraexposure.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
     \ingroup camera_qml
     \inqmlmodule QtMultimedia 5
 
-    This element is part of the \bold{QtMultimedia 5.0} module.
+    This element is part of the \b{QtMultimedia 5.0} module.
 
     This element allows you to adjust exposure related settings
     like aperture and shutter speed, metering and ISO speed.
@@ -291,19 +291,19 @@ void QDeclarativeCameraExposure::setAutoIsoSensitivity()
     Set the camera exposure mode to one of the following:
 
     \table
-    \header \o Value \o Description
-    \row \o Camera.ExposureManual        \o Manual mode.
-    \row \o Camera.ExposureAuto          \o Automatic mode.
-    \row \o Camera.ExposureNight         \o Night mode.
-    \row \o Camera.ExposureBacklight     \o Backlight exposure mode.
-    \row \o Camera.ExposureSpotlight     \o Spotlight exposure mode.
-    \row \o Camera.ExposureSports        \o Spots exposure mode.
-    \row \o Camera.ExposureSnow          \o Snow exposure mode.
-    \row \o Camera.ExposureBeach         \o Beach exposure mode.
-    \row \o Camera.ExposureLargeAperture \o Use larger aperture with small depth of field.
-    \row \o Camera.ExposureSmallAperture \o Use smaller aperture.
-    \row \o Camera.ExposurePortrait      \o Portrait exposure mode.
-    \row \o Camera.ExposureModeVendor    \o The base value for device specific exposure modes.
+    \header \li Value \li Description
+    \row \li Camera.ExposureManual        \li Manual mode.
+    \row \li Camera.ExposureAuto          \li Automatic mode.
+    \row \li Camera.ExposureNight         \li Night mode.
+    \row \li Camera.ExposureBacklight     \li Backlight exposure mode.
+    \row \li Camera.ExposureSpotlight     \li Spotlight exposure mode.
+    \row \li Camera.ExposureSports        \li Spots exposure mode.
+    \row \li Camera.ExposureSnow          \li Snow exposure mode.
+    \row \li Camera.ExposureBeach         \li Beach exposure mode.
+    \row \li Camera.ExposureLargeAperture \li Use larger aperture with small depth of field.
+    \row \li Camera.ExposureSmallAperture \li Use smaller aperture.
+    \row \li Camera.ExposurePortrait      \li Portrait exposure mode.
+    \row \li Camera.ExposureModeVendor    \li The base value for device specific exposure modes.
     \endtable
 */
 
@@ -351,10 +351,10 @@ void QDeclarativeCameraExposure::setSpotMeteringPoint(const QPointF &point)
     to one of the following:
 
     \table
-    \header \o Value \o Description
-    \row \o Camera.MeteringMatrix       \o A matrix of sample points is used to measure exposure.
-    \row \o Camera.MeteringAverage      \o An average is used to measure exposure.
-    \row \o Camera.MeteringSpot         \o A specific location (\l spotMeteringPoint) is used to measure exposure.
+    \header \li Value \li Description
+    \row \li Camera.MeteringMatrix       \li A matrix of sample points is used to measure exposure.
+    \row \li Camera.MeteringAverage      \li An average is used to measure exposure.
+    \row \li Camera.MeteringSpot         \li A specific location (\l spotMeteringPoint) is used to measure exposure.
     \endtable
 */
 QDeclarativeCamera::MeteringMode QDeclarativeCameraExposure::meteringMode() const
diff --git a/src/imports/multimedia/qdeclarativecameraflash.cpp b/src/imports/multimedia/qdeclarativecameraflash.cpp
index 53b448e28..8b5e23bd7 100644
--- a/src/imports/multimedia/qdeclarativecameraflash.cpp
+++ b/src/imports/multimedia/qdeclarativecameraflash.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
     \ingroup multimedia_qml
     \ingroup camera_qml
 
-    This element is part of the \bold{QtMultimedia 5.0} module.
+    This element is part of the \b{QtMultimedia 5.0} module.
 
     The CameraFlash element allows you to operate the camera flash
     hardware and control the flash mode used.  Not all cameras have
@@ -111,19 +111,19 @@ bool QDeclarativeCameraFlash::isFlashReady() const
     \property QDeclarativeCameraFlash::flashMode
 
     \table
-    \header \o Value \o Description
-    \row \o Camera.FlashOff             \o Flash is Off.
-    \row \o Camera.FlashOn              \o Flash is On.
-    \row \o Camera.FlashAuto            \o Automatic flash.
-    \row \o Camera.FlashRedEyeReduction \o Red eye reduction flash.
-    \row \o Camera.FlashFill            \o Use flash to fillin shadows.
-    \row \o Camera.FlashTorch           \o Constant light source, useful for focusing and video capture.
-    \row \o Camera.FlashSlowSyncFrontCurtain
-                                \o Use the flash in conjunction with a slow shutter speed.
+    \header \li Value \li Description
+    \row \li Camera.FlashOff             \li Flash is Off.
+    \row \li Camera.FlashOn              \li Flash is On.
+    \row \li Camera.FlashAuto            \li Automatic flash.
+    \row \li Camera.FlashRedEyeReduction \li Red eye reduction flash.
+    \row \li Camera.FlashFill            \li Use flash to fillin shadows.
+    \row \li Camera.FlashTorch           \li Constant light source, useful for focusing and video capture.
+    \row \li Camera.FlashSlowSyncFrontCurtain
+                                \li Use the flash in conjunction with a slow shutter speed.
                                 This mode allows better exposure of distant objects and/or motion blur effect.
-    \row \o Camera.FlashSlowSyncRearCurtain
-                                \o The similar mode to FlashSlowSyncFrontCurtain but flash is fired at the end of exposure.
-    \row \o Camera.FlashManual          \o Flash power is manually set.
+    \row \li Camera.FlashSlowSyncRearCurtain
+                                \li The similar mode to FlashSlowSyncFrontCurtain but flash is fired at the end of exposure.
+    \row \li Camera.FlashManual          \li Flash power is manually set.
     \endtable
 
 */
diff --git a/src/imports/multimedia/qdeclarativecamerafocus.cpp b/src/imports/multimedia/qdeclarativecamerafocus.cpp
index a75ebbf81..4140b22e2 100644
--- a/src/imports/multimedia/qdeclarativecamerafocus.cpp
+++ b/src/imports/multimedia/qdeclarativecamerafocus.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
     \ingroup multimedia_qml
     \ingroup camera_qml
 
-    This element is part of the \bold{QtMultimedia 5.0} module.
+    This element is part of the \b{QtMultimedia 5.0} module.
 
     The CameraFocus element allows control over manual and automatic
     focus settings, including information about any parts of the
@@ -207,10 +207,10 @@ void QDeclarativeCameraFocus::setCustomFocusPoint(const QPointF &point)
   and zone \c status as one of the following values:
 
     \table
-    \header \o Value \o Description
-    \row \o Camera.FocusAreaUnused  \o This focus point area is currently unused in autofocusing.
-    \row \o Camera.FocusAreaSelected    \o This focus point area is used in autofocusing, but is not in focus.
-    \row \o Camera.FocusAreaFocused  \o This focus point is used in autofocusing, and is in focus.
+    \header \li Value \li Description
+    \row \li Camera.FocusAreaUnused  \li This focus point area is currently unused in autofocusing.
+    \row \li Camera.FocusAreaSelected    \li This focus point area is used in autofocusing, but is not in focus.
+    \row \li Camera.FocusAreaFocused  \li This focus point is used in autofocusing, and is in focus.
     \endtable
 
 
diff --git a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
index e50a99996..1b4b071b8 100644
--- a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
+++ b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
@@ -97,17 +97,17 @@ QDeclarativeCameraImageProcessing::~QDeclarativeCameraImageProcessing()
     \qmlproperty enumeration QtMultimedia5::CameraImageProcessing::whiteBalanceMode
 
     \table
-    \header \o Value \o Description
-    \row \o WhiteBalanceManual       \o Manual white balance. In this mode the manual white balance property value is used.
-    \row \o WhiteBalanceAuto         \o Auto white balance mode.
-    \row \o WhiteBalanceSunlight     \o Sunlight white balance mode.
-    \row \o WhiteBalanceCloudy       \o Cloudy white balance mode.
-    \row \o WhiteBalanceShade        \o Shade white balance mode.
-    \row \o WhiteBalanceTungsten     \o Tungsten white balance mode.
-    \row \o WhiteBalanceFluorescent  \o Fluorescent white balance mode.
-    \row \o WhiteBalanceFlash        \o Flash white balance mode.
-    \row \o WhiteBalanceSunset       \o Sunset white balance mode.
-    \row \o WhiteBalanceVendor       \o Vendor defined white balance mode.
+    \header \li Value \li Description
+    \row \li WhiteBalanceManual       \li Manual white balance. In this mode the manual white balance property value is used.
+    \row \li WhiteBalanceAuto         \li Auto white balance mode.
+    \row \li WhiteBalanceSunlight     \li Sunlight white balance mode.
+    \row \li WhiteBalanceCloudy       \li Cloudy white balance mode.
+    \row \li WhiteBalanceShade        \li Shade white balance mode.
+    \row \li WhiteBalanceTungsten     \li Tungsten white balance mode.
+    \row \li WhiteBalanceFluorescent  \li Fluorescent white balance mode.
+    \row \li WhiteBalanceFlash        \li Flash white balance mode.
+    \row \li WhiteBalanceSunset       \li Sunset white balance mode.
+    \row \li WhiteBalanceVendor       \li Vendor defined white balance mode.
     \endtable
 
     \sa manualWhiteBalance
diff --git a/src/imports/multimedia/qdeclarativecamerarecorder.cpp b/src/imports/multimedia/qdeclarativecamerarecorder.cpp
index d3335229a..50e98591a 100644
--- a/src/imports/multimedia/qdeclarativecamerarecorder.cpp
+++ b/src/imports/multimedia/qdeclarativecamerarecorder.cpp
@@ -239,15 +239,15 @@ int QDeclarativeCameraRecorder::audioSampleRate() const
     The type of encoding method to use when recording audio.
 
     \table
-    \header \o Value \o Description
-    \row \o ConstantQualityEncoding
-         \o Encoding will aim to have a constant quality, adjusting bitrate to fit.
+    \header \li Value \li Description
+    \row \li ConstantQualityEncoding
+         \li Encoding will aim to have a constant quality, adjusting bitrate to fit.
             This is the default.  The bitrate setting will be ignored.
-    \row \o ConstantBitRateEncoding
-         \o Encoding will use a constant bit rate, adjust quality to fit.  This is
+    \row \li ConstantBitRateEncoding
+         \li Encoding will use a constant bit rate, adjust quality to fit.  This is
             appropriate if you are trying to optimize for space.
-    \row \o AverageBitRateEncoding
-         \o Encoding will try to keep an average bitrate setting, but will use
+    \row \li AverageBitRateEncoding
+         \li Encoding will try to keep an average bitrate setting, but will use
             more or less as needed.
     \endtable
 
@@ -263,15 +263,15 @@ QDeclarativeCameraRecorder::EncodingMode QDeclarativeCameraRecorder::videoEncodi
     The type of encoding method to use when recording audio.
 
     \table
-    \header \o Value \o Description
-    \row \o ConstantQualityEncoding
-         \o Encoding will aim to have a constant quality, adjusting bitrate to fit.
+    \header \li Value \li Description
+    \row \li ConstantQualityEncoding
+         \li Encoding will aim to have a constant quality, adjusting bitrate to fit.
             This is the default.  The bitrate setting will be ignored.
-    \row \o ConstantBitRateEncoding
-         \o Encoding will use a constant bit rate, adjust quality to fit.  This is
+    \row \li ConstantBitRateEncoding
+         \li Encoding will use a constant bit rate, adjust quality to fit.  This is
             appropriate if you are trying to optimize for space.
-    \row \o AverageBitRateEncoding
-         \o Encoding will try to keep an average bitrate setting, but will use
+    \row \li AverageBitRateEncoding
+         \li Encoding will try to keep an average bitrate setting, but will use
             more or less as needed.
     \endtable
 */
@@ -365,12 +365,12 @@ QString QDeclarativeCameraRecorder::errorString() const
     The current state of the camera recorder object.
 
     \table
-    \header \o Value \o Description
-    \row \o StoppedState
-         \o The camera is not recording video.
+    \header \li Value \li Description
+    \row \li StoppedState
+         \li The camera is not recording video.
 
-    \row \o RecordingState
-         \o The camera is recording video.
+    \row \li RecordingState
+         \li The camera is recording video.
     \endtable
 */
 QDeclarativeCameraRecorder::RecorderState QDeclarativeCameraRecorder::recorderState() const
diff --git a/src/imports/multimedia/qdeclarativeradio.cpp b/src/imports/multimedia/qdeclarativeradio.cpp
index 2fcde3dfa..c029cae12 100644
--- a/src/imports/multimedia/qdeclarativeradio.cpp
+++ b/src/imports/multimedia/qdeclarativeradio.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
     \ingroup multimedia_qml
     \inherits Item
 
-    This element is part of the \bold{QtMultimedia 5.0} module.
+    This element is part of the \b{QtMultimedia 5.0} module.
 
     \qml
     import QtQuick 2.0
@@ -125,12 +125,12 @@ QDeclarativeRadio::~QDeclarativeRadio()
     This property holds the current state of the Radio element.
 
     \table
-    \header \o Value \o Description
-    \row \o ActiveState
-        \o The radio is started and active
+    \header \li Value \li Description
+    \row \li ActiveState
+        \li The radio is started and active
 
-    \row \o StoppedState
-        \o The radio is stopped
+    \row \li StoppedState
+        \li The radio is stopped
 
     \endtable
 
@@ -148,21 +148,21 @@ QDeclarativeRadio::State QDeclarativeRadio::state() const
     any one of the values in the table below.
 
     \table
-    \header \o Value \o Description
-    \row \o AM
-        \o 520 to 1610 kHz, 9 or 10kHz channel spacing, extended 1610 to 1710 kHz
+    \header \li Value \li Description
+    \row \li AM
+        \li 520 to 1610 kHz, 9 or 10kHz channel spacing, extended 1610 to 1710 kHz
 
-    \row \o FM
-        \o 87.5 to 108.0 MHz, except Japan 76-90 MHz
+    \row \li FM
+        \li 87.5 to 108.0 MHz, except Japan 76-90 MHz
 
-    \row \o SW
-        \o 1.711 to 30.0 MHz, divided into 15 bands. 5kHz channel spacing
+    \row \li SW
+        \li 1.711 to 30.0 MHz, divided into 15 bands. 5kHz channel spacing
 
-    \row \o LW
-        \o 148.5 to 283.5 kHz, 9kHz channel spacing (Europe, Africa, Asia)
+    \row \li LW
+        \li 148.5 to 283.5 kHz, 9kHz channel spacing (Europe, Africa, Asia)
 
-    \row \o FM2
-        \o range not defined, used when area supports more than one FM range
+    \row \li FM2
+        \li range not defined, used when area supports more than one FM range
 
     \endtable
 */
@@ -191,15 +191,15 @@ int QDeclarativeRadio::frequency() const
     values in the table below.
 
     \table
-    \header \o Value \o Description
-    \row \o Auto
-        \o Uses stereo mode matching the station
+    \header \li Value \li Description
+    \row \li Auto
+        \li Uses stereo mode matching the station
 
-    \row \o ForceStereo
-        \o Forces the radio to play the station in stereo, converting the sound signal if necessary
+    \row \li ForceStereo
+        \li Forces the radio to play the station in stereo, converting the sound signal if necessary
 
-    \row \o ForceMono
-        \o Forces the radio to play the station in mono, converting the sound signal if necessary
+    \row \li ForceMono
+        \li Forces the radio to play the station in mono, converting the sound signal if necessary
 
     \endtable
 */
@@ -378,12 +378,12 @@ void QDeclarativeRadio::scanUp()
     table below.
 
     \table
-    \header \o Value \o Description
-    \row \o SearchFast
-        \o Stores each radio station for later retrival and tuning
+    \header \li Value \li Description
+    \row \li SearchFast
+        \li Stores each radio station for later retrival and tuning
 
-    \row \o SearchGetStationId
-        \o Does the same as SearchFast, but also emits the station Id with the \l stationFound signal.
+    \row \li SearchGetStationId
+        \li Does the same as SearchFast, but also emits the station Id with the \l stationFound signal.
 
     \endtable
 
diff --git a/src/imports/multimedia/qdeclarativeradiodata.cpp b/src/imports/multimedia/qdeclarativeradiodata.cpp
index c9aa9f8d0..ccc36629e 100644
--- a/src/imports/multimedia/qdeclarativeradiodata.cpp
+++ b/src/imports/multimedia/qdeclarativeradiodata.cpp
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
     \ingroup multimedia_qml
     \inherits Item
 
-    This element is part of the \bold{QtMultimedia 5.0} module.
+    This element is part of the \b{QtMultimedia 5.0} module.
 
     The \c RadioData element is your gateway to all the data available through RDS. RDS is the Radio Data System
     which allows radio stations to broadcast information like the \l stationId, \l programType, \l programTypeName,
@@ -148,55 +148,55 @@ QString QDeclarativeRadioData::stationId() const
     table below.
 
     \table
-    \header \o Value
-        \row \o Undefined
-        \row \o News
-        \row \o CurrentAffairs
-        \row \o Information
-        \row \o Sport
-        \row \o Education
-        \row \o Drama
-        \row \o Culture
-        \row \o Science
-        \row \o Varied
-        \row \o PopMusic
-        \row \o RockMusic
-        \row \o EasyListening
-        \row \o LightClassical
-        \row \o SeriousClassical
-        \row \o OtherMusic
-        \row \o Weather
-        \row \o Finance
-        \row \o ChildrensProgrammes
-        \row \o SocialAffairs
-        \row \o Religion
-        \row \o PhoneIn
-        \row \o Travel
-        \row \o Leisure
-        \row \o JazzMusic
-        \row \o CountryMusic
-        \row \o NationalMusic
-        \row \o OldiesMusic
-        \row \o FolkMusic
-        \row \o Documentary
-        \row \o AlarmTest
-        \row \o Alarm
-        \row \o Talk
-        \row \o ClassicRock
-        \row \o AdultHits
-        \row \o SoftRock
-        \row \o Top40
-        \row \o Soft
-        \row \o Nostalgia
-        \row \o Classical
-        \row \o RhythmAndBlues
-        \row \o SoftRhythmAndBlues
-        \row \o Language
-        \row \o ReligiousMusic
-        \row \o ReligiousTalk
-        \row \o Personality
-        \row \o Public
-        \row \o College
+    \header \li Value
+        \row \li Undefined
+        \row \li News
+        \row \li CurrentAffairs
+        \row \li Information
+        \row \li Sport
+        \row \li Education
+        \row \li Drama
+        \row \li Culture
+        \row \li Science
+        \row \li Varied
+        \row \li PopMusic
+        \row \li RockMusic
+        \row \li EasyListening
+        \row \li LightClassical
+        \row \li SeriousClassical
+        \row \li OtherMusic
+        \row \li Weather
+        \row \li Finance
+        \row \li ChildrensProgrammes
+        \row \li SocialAffairs
+        \row \li Religion
+        \row \li PhoneIn
+        \row \li Travel
+        \row \li Leisure
+        \row \li JazzMusic
+        \row \li CountryMusic
+        \row \li NationalMusic
+        \row \li OldiesMusic
+        \row \li FolkMusic
+        \row \li Documentary
+        \row \li AlarmTest
+        \row \li Alarm
+        \row \li Talk
+        \row \li ClassicRock
+        \row \li AdultHits
+        \row \li SoftRock
+        \row \li Top40
+        \row \li Soft
+        \row \li Nostalgia
+        \row \li Classical
+        \row \li RhythmAndBlues
+        \row \li SoftRhythmAndBlues
+        \row \li Language
+        \row \li ReligiousMusic
+        \row \li ReligiousTalk
+        \row \li Personality
+        \row \li Public
+        \row \li College
 
     \endtable
   */
diff --git a/src/imports/multimedia/qdeclarativetorch.cpp b/src/imports/multimedia/qdeclarativetorch.cpp
index 4ae985c93..74249d197 100644
--- a/src/imports/multimedia/qdeclarativetorch.cpp
+++ b/src/imports/multimedia/qdeclarativetorch.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 
     \ingroup multimedia_qml
 
-    This element is part of the \bold{QtMultimedia 5.0} module.
+    This element is part of the \b{QtMultimedia 5.0} module.
 
     In many cases the torch hardware is shared with camera flash functionality,
     and might be automatically controlled by the device.  You have control over
diff --git a/src/imports/multimedia/qdeclarativevideooutput.cpp b/src/imports/multimedia/qdeclarativevideooutput.cpp
index e56c167ce..ae8064bce 100644
--- a/src/imports/multimedia/qdeclarativevideooutput.cpp
+++ b/src/imports/multimedia/qdeclarativevideooutput.cpp
@@ -125,7 +125,7 @@ private:
     \ingroup multimedia_qml
     \inqmlmodule QtMultimedia 5
 
-    This element is part of the \bold{QtMultimedia 5.0} module.
+    This element is part of the \b{QtMultimedia 5.0} module.
 
     \qml
     import QtQuick 2.0
@@ -344,9 +344,9 @@ static inline int qNormalizedOrientation(int o)
     Set this property to define how the video is scaled to fit the target area.
 
     \list
-    \o Stretch - the video is scaled to fit.
-    \o PreserveAspectFit - the video is scaled uniformly to fit without cropping
-    \o PreserveAspectCrop - the video is scaled uniformly to fill, cropping if necessary
+    \li Stretch - the video is scaled to fit.
+    \li PreserveAspectFit - the video is scaled uniformly to fit without cropping
+    \li PreserveAspectCrop - the video is scaled uniformly to fill, cropping if necessary
     \endlist
 
     The default fill mode is PreserveAspectFit.