summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2012-06-06 12:28:34 +1000
committerQt by Nokia <qt-info@nokia.com>2012-06-07 07:05:57 +0200
commitf53788ae42175bd3b7cda1a18366086b285f6f1d (patch)
treeff0581a23c7ee28e4ada783867ab5e8685d6fa4e /src/imports
parenta8ec84e3ca3abec75f99801db9128bf9ea490e31 (diff)
A number of documentation fixes.
* Remove references to private QMediaServiceProvider class and point new backend writers to irc/mailing lists * Wrong or missing parameter names * Fix a few links * Correct a few property data types * Various other things to keep qdoc happier Change-Id: I5c8800d65c00f0783541afef35990bd3918acab7 Reviewed-by: Angus Cummings <angus.cummings@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/multimedia/qdeclarativeaudio.cpp2
-rw-r--r--src/imports/multimedia/qdeclarativecameracapture.cpp2
-rw-r--r--src/imports/multimedia/qdeclarativecameraimageprocessing.cpp8
3 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index 347a49f99..9e09e270e 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -1105,7 +1105,7 @@ void QDeclarativeAudio::_q_statusChanged()
///////////// MediaPlayer Docs /////////////
/*!
- \qmlclass MediaPlayer
+ \qmlclass MediaPlayer QDeclarativeAudio
\brief The MediaPlayer type allows you to add media playback to a scene.
\inqmlmodule QtMultimedia 5
diff --git a/src/imports/multimedia/qdeclarativecameracapture.cpp b/src/imports/multimedia/qdeclarativecameracapture.cpp
index 8c575c9c0..56987f712 100644
--- a/src/imports/multimedia/qdeclarativecameracapture.cpp
+++ b/src/imports/multimedia/qdeclarativecameracapture.cpp
@@ -131,7 +131,7 @@ QDeclarativeCameraCapture::~QDeclarativeCameraCapture()
Indicates camera is ready to capture photo.
It's permissible to call capture() while the camera is active
- regardless of isReadyForCapture property value.
+ regardless of the \e ready property value.
If camera is not ready to capture image immediately,
the capture request is queued with all the related camera settings
to be executed as soon as possible.
diff --git a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
index 385da404a..ff329982e 100644
--- a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
+++ b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
@@ -152,7 +152,7 @@ void QDeclarativeCameraImageProcessing::setManualWhiteBalance(qreal colorTemp) c
}
/*!
- \qmlproperty int QtMultimedia5::CameraImageProcessing::contrast
+ \qmlproperty qreal QtMultimedia5::CameraImageProcessing::contrast
Image contrast adjustment.
Valid contrast adjustment values range between -1.0 and 1.0, with a default of 0.
@@ -171,7 +171,7 @@ void QDeclarativeCameraImageProcessing::setContrast(qreal value)
}
/*!
- \qmlproperty int QtMultimedia5::CameraImageProcessing::saturation
+ \qmlproperty qreal QtMultimedia5::CameraImageProcessing::saturation
Image saturation adjustment.
Valid saturation adjustment values range between -1.0 and 1.0, the default is 0.
@@ -190,7 +190,7 @@ void QDeclarativeCameraImageProcessing::setSaturation(qreal value)
}
/*!
- \qmlproperty int QtMultimedia5::CameraImageProcessing::sharpeningLevel
+ \qmlproperty qreal QtMultimedia5::CameraImageProcessing::sharpeningLevel
Adjustment of sharpening level applied to image.
@@ -211,7 +211,7 @@ void QDeclarativeCameraImageProcessing::setSharpeningLevel(qreal value)
}
/*!
- \qmlproperty int QtMultimedia5::CameraImageProcessing::denoisingLevel
+ \qmlproperty qreal QtMultimedia5::CameraImageProcessing::denoisingLevel
Adjustment of denoising applied to image.