diff options
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/audioengine/qdeclarative_audiosample_p.cpp | 3 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativecameraexposure.cpp | 4 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativecameraflash.cpp | 4 |
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 |