Fix qdoc warnings.
Change-Id: Ie351f33f88270186b7df0f9cd671fa4e31624231 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
@@ -1042,6 +1042,19 @@ void QCamera::unlock()
|
||||
\sa QCamera::supportedViewfinderFrameRateRanges(), QCameraViewfinderSettings
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QCamera::FrameRateRange::FrameRateRange()
|
||||
|
||||
Constructs a null frame rate range, with both minimumFrameRate and maximumFrameRate
|
||||
equal to \c 0.0.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QCamera::FrameRateRange::FrameRateRange(qreal minimum, qreal maximum)
|
||||
|
||||
Constructs a frame rate range with the given \a minimum and \a maximum frame rates.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\variable QCamera::FrameRateRange::minimumFrameRate
|
||||
The minimum frame rate supported by the range, in frames per second.
|
||||
|
||||
@@ -319,7 +319,7 @@ void QCameraImageProcessing::setDenoisingLevel(qreal level)
|
||||
*/
|
||||
|
||||
/*!
|
||||
\enum QCameraImageProcessing::Filter
|
||||
\enum QCameraImageProcessing::ColorFilter
|
||||
|
||||
\value ColorFilterNone No filter is applied to images.
|
||||
\value ColorFilterGrayscale A grayscale filter.
|
||||
|
||||
@@ -135,6 +135,18 @@ QCameraViewfinderSettings &QCameraViewfinderSettings::operator=(const QCameraVie
|
||||
return *this;
|
||||
}
|
||||
|
||||
/*! \fn QCameraViewfinderSettings &QCameraViewfinderSettings::operator=(QCameraViewfinderSettings &&other)
|
||||
|
||||
Moves \a other to this viewfinder settings object and returns a reference to this object.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn void QCameraViewfinderSettings::swap(QCameraViewfinderSettings &other)
|
||||
|
||||
Swaps this viewfinder settings object with \a other. This
|
||||
function is very fast and never fails.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\relates QCameraViewfinderSettings
|
||||
\since 5.5
|
||||
|
||||
@@ -101,12 +101,18 @@
|
||||
\row
|
||||
\li QAudioOutput
|
||||
\li Sends audio data to an audio output device
|
||||
\row
|
||||
\li QAudioRecorder
|
||||
\li Record media content from an audio source.
|
||||
\row
|
||||
\li QCamera
|
||||
\li Access camera viewfinder.
|
||||
\row
|
||||
\li QCameraImageCapture
|
||||
\li Record media content. Intended to be used with QCamera to record media.
|
||||
\li Capture still images with a camera.
|
||||
\row
|
||||
\li QMediaRecorder
|
||||
\li Record media content from a camera or radio tuner source.
|
||||
\row
|
||||
\li QMediaPlayer
|
||||
\li Playback media from a source.
|
||||
@@ -114,8 +120,8 @@
|
||||
\li QRadioTuner
|
||||
\li Access radio device.
|
||||
\row
|
||||
\li QVideoRendererControl
|
||||
\li Control video data.
|
||||
\li QAbstractVideoSurface
|
||||
\li Base class for video presentation.
|
||||
\endtable
|
||||
|
||||
\section1 Related Information
|
||||
|
||||
@@ -887,14 +887,6 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider()
|
||||
Destroys a media service supported devices interface.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\since 5.3
|
||||
|
||||
\fn QByteArray QMediaServiceSupportedDevicesInterface::defaultDevice(const QByteArray &service) const
|
||||
|
||||
Returns the default device for a \a service type.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QList<QByteArray> QMediaServiceSupportedDevicesInterface::devices(const QByteArray &service) const
|
||||
|
||||
@@ -907,6 +899,29 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider()
|
||||
Returns the description of a \a device available for a \a service type.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\class QMediaServiceDefaultDeviceInterface
|
||||
\inmodule QtMultimedia
|
||||
\brief The QMediaServiceDefaultDeviceInterface class interface
|
||||
identifies the default device used by a media service plug-in.
|
||||
|
||||
A QMediaServiceProviderPlugin may implement this interface.
|
||||
|
||||
\since 5.3
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QMediaServiceDefaultDeviceInterface::~QMediaServiceDefaultDeviceInterface()
|
||||
|
||||
Destroys a media service default device interface.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QByteArray QMediaServiceDefaultDeviceInterface::defaultDevice(const QByteArray &service) const
|
||||
|
||||
Returns the default device for a \a service type.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\class QMediaServiceCameraInfoInterface
|
||||
\inmodule QtMultimedia
|
||||
@@ -918,6 +933,12 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider()
|
||||
implement the QMediaServiceSupportedDevicesInterface.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QMediaServiceCameraInfoInterface::~QMediaServiceCameraInfoInterface()
|
||||
|
||||
Destroys a media service camera info interface.
|
||||
*/
|
||||
|
||||
/*!
|
||||
\fn QMediaServiceCameraInfoInterface::cameraPosition(const QByteArray &device) const
|
||||
|
||||
|
||||
@@ -276,10 +276,13 @@ QAbstractVideoFilter::~QAbstractVideoFilter()
|
||||
}
|
||||
|
||||
/*!
|
||||
\return \c true if the filter is active.
|
||||
\property QAbstractVideoFilter::active
|
||||
\brief the active status of the filter.
|
||||
|
||||
By default filters are active. When set to \c false, the filter will be
|
||||
ignored by the VideoOutput type.
|
||||
This is true if the filter is active, false otherwise.
|
||||
|
||||
By default filters are active. When set to \c false, the filter will be
|
||||
ignored by the VideoOutput type.
|
||||
*/
|
||||
bool QAbstractVideoFilter::isActive() const
|
||||
{
|
||||
@@ -287,9 +290,6 @@ bool QAbstractVideoFilter::isActive() const
|
||||
return d->active;
|
||||
}
|
||||
|
||||
/*!
|
||||
\internal
|
||||
*/
|
||||
void QAbstractVideoFilter::setActive(bool v)
|
||||
{
|
||||
Q_D(QAbstractVideoFilter);
|
||||
|
||||
Reference in New Issue
Block a user