summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/multimedia')
-rw-r--r--src/imports/multimedia/qdeclarativecameraflash.cpp8
-rw-r--r--src/imports/multimedia/qdeclarativecameraimageprocessing.cpp2
2 files changed, 1 insertions, 9 deletions
diff --git a/src/imports/multimedia/qdeclarativecameraflash.cpp b/src/imports/multimedia/qdeclarativecameraflash.cpp
index 966ef7ee2..030d55160 100644
--- a/src/imports/multimedia/qdeclarativecameraflash.cpp
+++ b/src/imports/multimedia/qdeclarativecameraflash.cpp
@@ -77,11 +77,7 @@ QDeclarativeCameraFlash::QDeclarativeCameraFlash(QCamera *camera, QObject *paren
QDeclarativeCameraFlash::~QDeclarativeCameraFlash()
{
}
-/*!
- \property bool QDeclarativeCameraFlash::ready
- This property indicates whether the flash is charged.
-*/
/*!
\qmlproperty bool QtMultimedia::CameraFlash::ready
@@ -91,11 +87,7 @@ bool QDeclarativeCameraFlash::isFlashReady() const
{
return m_exposure->isFlashReady();
}
-/*!
- \property QDeclarativeCameraFlash::mode
- This property holds the camera flash mode. The mode can be one of the constants in \l QCameraExposure::FlashMode.
-*/
/*!
\qmlproperty enumeration QtMultimedia::CameraFlash::mode
diff --git a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
index d31ea7a09..de5aee85b 100644
--- a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
+++ b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
@@ -218,7 +218,7 @@ void QDeclarativeCameraImageProcessing::setDenoisingLevel(qreal value)
}
/*!
- \qmlproperty QtMultimedia::CameraImageProcessing::colorFilter
+ \qmlproperty enumeration QtMultimedia::CameraImageProcessing::colorFilter
This property holds which color filter if any will be applied to image data captured by the camera.