Fixing doc errors in MediaPlayer and CameraFlash
properties were not showing up for either type. There were namespace errors in flash, and mediaplayer docs needed to be copied from audio. Change-Id: I53fa721ec9e0cfa1aee3586c7e3eb608b9a1b465 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
This commit is contained in:
committed by
Qt by Nokia
parent
a95de846d9
commit
e063610527
@@ -75,12 +75,6 @@ QT_BEGIN_NAMESPACE
|
||||
\endqml
|
||||
*/
|
||||
|
||||
/*!
|
||||
\class QDeclarativeCameraFlash
|
||||
\internal
|
||||
\brief The CameraFlash provides interface for flash related camera settings.
|
||||
*/
|
||||
|
||||
/*!
|
||||
Construct a declarative camera flash object using \a parent object.
|
||||
*/
|
||||
@@ -96,7 +90,7 @@ QDeclarativeCameraFlash::~QDeclarativeCameraFlash()
|
||||
}
|
||||
|
||||
/*!
|
||||
\qmlproperty bool QtMultimedia5::QDeclarativeCameraFlash::ready
|
||||
\qmlproperty bool QtMultimedia5::CameraFlash::ready
|
||||
\property bool QDeclarativeCameraFlash::ready
|
||||
|
||||
Indicates flash is charged.
|
||||
@@ -107,7 +101,7 @@ bool QDeclarativeCameraFlash::isFlashReady() const
|
||||
}
|
||||
|
||||
/*!
|
||||
\qmlproperty enumeration QtMultimedia5::CameraExposure::flashMode
|
||||
\qmlproperty enumeration QtMultimedia5::CameraFlash::flashMode
|
||||
\property QDeclarativeCameraFlash::flashMode
|
||||
|
||||
\table
|
||||
@@ -141,13 +135,13 @@ void QDeclarativeCameraFlash::setFlashMode(int mode)
|
||||
}
|
||||
|
||||
/*!
|
||||
\qmlsignal QtMultimedia5::CameraExposure::flashModeChanged(int)
|
||||
\qmlsignal QtMultimedia5::CameraFlash::flashModeChanged(int)
|
||||
This signal is emitted when the \c flashMode property is changed.
|
||||
The corresponding handler is \c onFlashModeChanged.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\qmlsignal QtMultimedia5::CameraExposure::flashReady(bool)
|
||||
\qmlsignal QtMultimedia5::CameraFlash::flashReady(bool)
|
||||
This signal is emitted when QCameraExposure indicates that
|
||||
the flash is ready to use.
|
||||
The corresponsing handler is \c onFlashReadyChanged.
|
||||
|
||||
Reference in New Issue
Block a user