summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorVenugopal Shivashankar <venugopal.shivashankar@nokia.com>2012-07-25 15:17:28 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-26 11:51:31 +0200
commit6ebee9f57e0e4e189b667605bfe9436504bd7385 (patch)
tree003cdf0483604a83d5b0b28e0d0a6d15919feb6c /src/imports
parent27a7559c7e87dd0c38a4b8aa1248689c1f95b216 (diff)
Fixed QDoc errors related to snippets and quotefromfile commands
Change-Id: I9dd6381eb95dcbd9aa5cc8f596d87cf55eee7427 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/audioengine/qdeclarative_audiosample_p.cpp3
-rw-r--r--src/imports/multimedia/qdeclarativecameraexposure.cpp4
-rw-r--r--src/imports/multimedia/qdeclarativecameraflash.cpp4
3 files changed, 7 insertions, 4 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