Fixed QDoc errors related to snippets and quotefromfile commands

Change-Id: I9dd6381eb95dcbd9aa5cc8f596d87cf55eee7427
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>

9 files changed, 18 insertions, 14 deletions

diff --git a/src/imports/audioengine/qdeclarative_audiosample_p.cpp b/src/imports/audioengine/qdeclarative_audiosample_p.cpp
index d56f846fa..c645bb1b8 100644
--- a/src/imports/audioengine/qdeclarative_audiosample_p.cpp
+++ b/src/imports/audioengine/qdeclarative_audiosample_p.cpp
@@ -236,9 +236,12 @@ QSoundBuffer* QDeclarativeAudioSample::soundBuffer() const
 }
 
 /*!
+    \omit
+    Note: This QML property is documented twice.
     \qmlproperty bool QtAudioEngine1::AudioSample::loaded
 
     This property holds the load status of the audio sample.
+    \endomit
 */
 
 
diff --git a/src/imports/multimedia/qdeclarativecameraexposure.cpp b/src/imports/multimedia/qdeclarativecameraexposure.cpp
index d8c4f27a3..0388085d5 100644
--- a/src/imports/multimedia/qdeclarativecameraexposure.cpp
+++ b/src/imports/multimedia/qdeclarativecameraexposure.cpp
@@ -175,8 +175,8 @@ qreal QDeclarativeCameraExposure::aperture() const
 }
 
 /*!
-    \qmlproperty integer QtMultimedia5::CameraExposure::manualIsoSensitivity
-    \property QDeclarativeCameraExposure::manualIsoSensitivity
+    \qmlproperty real QtMultimedia5::CameraExposure::manualIso
+    \property QReal QDeclarativeCameraExposure::manualIso
 
     This property allows you to set a specific ISO setting
     for image capturing.
diff --git a/src/imports/multimedia/qdeclarativecameraflash.cpp b/src/imports/multimedia/qdeclarativecameraflash.cpp
index 2f9526ed0..7048a2cd9 100644
--- a/src/imports/multimedia/qdeclarativecameraflash.cpp
+++ b/src/imports/multimedia/qdeclarativecameraflash.cpp
@@ -101,8 +101,8 @@ bool QDeclarativeCameraFlash::isFlashReady() const
 }
 
 /*!
-    \qmlproperty enumeration QtMultimedia5::CameraFlash::flashMode
-    \property QDeclarativeCameraFlash::flashMode
+    \qmlproperty enumeration QtMultimedia5::CameraFlash::mode
+    \property int QDeclarativeCameraFlash::mode
 
     \table
     \header \li Value \li Description
diff --git a/src/multimedia/controls/qmediarecordercontrol.cpp b/src/multimedia/controls/qmediarecordercontrol.cpp
index a60eb6827..1cfc11fb8 100644
--- a/src/multimedia/controls/qmediarecordercontrol.cpp
+++ b/src/multimedia/controls/qmediarecordercontrol.cpp
@@ -199,7 +199,7 @@ QMediaRecorderControl::~QMediaRecorderControl()
 */
 
 /*!
-    \fn void QMediaRecorderControl::volume(qreal gain)
+    \fn void QMediaRecorderControl::volumeChanged(qreal gain)
 
     Signals that the audio \a gain value has changed.
 */
diff --git a/src/multimedia/doc/qtmultimedia.qdocconf b/src/multimedia/doc/qtmultimedia.qdocconf
index 98e2bd3b2..d9ad7e9e6 100644
--- a/src/multimedia/doc/qtmultimedia.qdocconf
+++ b/src/multimedia/doc/qtmultimedia.qdocconf
@@ -17,13 +17,11 @@ description = Qt Multimedia Documentation
 exampledirs += .. \
                ../../../examples
 
-headerdirs += src \
-              ../..
+headerdirs += ../..
 
 imagedirs += src/images \
 
-sourcedirs += src \
-              ../..
+sourcedirs += ../..
 
 excludedirs +=
 
diff --git a/src/multimedia/doc/src/examples/qmlvideo.qdoc b/src/multimedia/doc/src/examples/qmlvideo.qdoc
index 47afeb905..3d3fe8e9c 100644
--- a/src/multimedia/doc/src/examples/qmlvideo.qdoc
+++ b/src/multimedia/doc/src/examples/qmlvideo.qdoc
@@ -83,7 +83,7 @@ can see from the code, this makes use of a type of inheritance: a
 ... is-a
 \l{video/qmlvideo/qml/qmlvideo/SceneBasic.qml}{SceneBasic} ...
 
-\quotefromfile examples/video/qmlvideo/qml/qmlvideo/SceneBasic.qml
+\quotefromfile video/qmlvideo/qml/qmlvideo/SceneBasic.qml
 \skipto import
 \printuntil contentType
 \dots
diff --git a/src/multimedia/doc/src/qtmultimedia-cpp.qdoc b/src/multimedia/doc/src/qtmultimedia-cpp.qdoc
index c99633952..1df7ddfbc 100644
--- a/src/multimedia/doc/src/qtmultimedia-cpp.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia-cpp.qdoc
@@ -35,11 +35,15 @@
     To include the definitions of the module's classes, use the
     following directive:
 
-    \snippet doc/src/snippets/code/doc_src_qtmultimedia.cpp 1
+    \code
+    #include <QtMultimedia>
+    \endcode
 
     To link against the module, add this line to your \l qmake \c
     .pro file:
 
-    \snippet doc/src/snippets/code/doc_src_qtmultimedia.pro 0
+    \code
+    QT += multimedia
+    \endcode
 
 */
diff --git a/src/multimedia/doc/src/qtmultimedia5.qdoc b/src/multimedia/doc/src/qtmultimedia5.qdoc
index f8397ea4e..53d9f6119 100644
--- a/src/multimedia/doc/src/qtmultimedia5.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia5.qdoc
@@ -37,6 +37,5 @@ The identifying string for this component is \e QtMultimedia. Use this in the QM
 \section1 QML types
 
 \annotatedlist multimedia_qml
-
 */
 
diff --git a/src/multimedia/doc/src/videooverview.qdoc b/src/multimedia/doc/src/videooverview.qdoc
index c78915200..a5fb75f66 100644
--- a/src/multimedia/doc/src/videooverview.qdoc
+++ b/src/multimedia/doc/src/videooverview.qdoc
@@ -82,7 +82,7 @@ allows you to receive these frames from \l QMediaPlayer and
 and with an instance of this surface, \c myVideoSurface, you can set
 the surface as the \l {QMediaPlayer::setVideoOutput()}{video output} for QMediaPlayer.
 
-\snippet doc/src/snippets/multimedia-snippets/video.cpp Setting Surface in Player
+\snippet doc/src/snippets/multimedia-snippets/video.cpp Setting surface in player
 
 Several of the built-in Qt classes offer this functionality
 as well, so if you decode video in your application, you can present