summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-04-16 06:19:35 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-04-16 06:19:35 (GMT)
commitc01c0c9746fbd54d29683b79de2bf973e5c40cec (patch)
treef726b7a2af48001148cc2427c8f78ae8bcaf0e6c /src/imports
parentecdc0ebacd97f0d607dcbe884751c203a296a88c (diff)
downloadQt-c01c0c9746fbd54d29683b79de2bf973e5c40cec.zip
Qt-c01c0c9746fbd54d29683b79de2bf973e5c40cec.tar.gz
Qt-c01c0c9746fbd54d29683b79de2bf973e5c40cec.tar.bz2
More QML doc consistency.
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/multimedia/qdeclarativeaudio.cpp10
-rw-r--r--src/imports/multimedia/qdeclarativevideo.cpp16
-rw-r--r--src/imports/particles/qdeclarativeparticles.cpp14
3 files changed, 20 insertions, 20 deletions
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index 82d5d89..849c51d 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -195,7 +195,7 @@ void QDeclarativeAudio::stop()
*/
/*!
- \qmlproperty enum Audio::status
+ \qmlproperty enumeration Audio::status
This property holds the status of media loading. It can be one of:
@@ -263,7 +263,7 @@ QDeclarativeAudio::Status QDeclarativeAudio::status() const
*/
/*!
- \qmlproperty qreal Audio::volume
+ \qmlproperty real Audio::volume
This property holds the volume of the audio output, from 0.0 (silent) to 1.0 (maximum volume).
*/
@@ -275,7 +275,7 @@ QDeclarativeAudio::Status QDeclarativeAudio::status() const
*/
/*!
- \qmlproperty qreal Audio::bufferProgress
+ \qmlproperty real Audio::bufferProgress
This property holds how much of the data buffer is currently filled, from 0.0 (empty) to 1.0
(full).
@@ -290,13 +290,13 @@ QDeclarativeAudio::Status QDeclarativeAudio::status() const
*/
/*!
- \qmlproperty qreal Audio::playbackRate
+ \qmlproperty real Audio::playbackRate
This property holds the rate at which audio is played at as a multiple of the normal rate.
*/
/*!
- \qmlproperty enum Audio::error
+ \qmlproperty enumeration Audio::error
This property holds the error state of the audio. It can be one of:
diff --git a/src/imports/multimedia/qdeclarativevideo.cpp b/src/imports/multimedia/qdeclarativevideo.cpp
index c6ae272..d84d304 100644
--- a/src/imports/multimedia/qdeclarativevideo.cpp
+++ b/src/imports/multimedia/qdeclarativevideo.cpp
@@ -82,11 +82,11 @@ void QDeclarativeVideo::_q_error(int errorCode, const QString &errorString)
Video { source: "video/movie.mpg" }
\endqml
- The video item supports untransformed, stretched, and uniformly scaled video presentation.
+ The Video item supports untransformed, stretched, and uniformly scaled video presentation.
For a description of stretched uniformly scaled presentation, see the \l fillMode property
description.
- The video item is only visible when the \l hasVideo property is true and the video is playing.
+ The Video item is only visible when the \l hasVideo property is true and the video is playing.
\sa Audio
*/
@@ -169,7 +169,7 @@ QDeclarativeVideo::~QDeclarativeVideo()
*/
/*!
- \qmlproperty enum Video::status
+ \qmlproperty enumeration Video::status
This property holds the status of media loading. It can be one of:
@@ -236,7 +236,7 @@ QDeclarativeVideo::Status QDeclarativeVideo::status() const
*/
/*!
- \qmlproperty qreal Video::volume
+ \qmlproperty real Video::volume
This property holds the volume of the audio output, from 0.0 (silent) to 1.0 (maximum volume).
*/
@@ -270,7 +270,7 @@ bool QDeclarativeVideo::hasVideo() const
}
/*!
- \qmlproperty qreal Video::bufferProgress
+ \qmlproperty real Video::bufferProgress
This property holds how much of the data buffer is currently filled, from 0.0 (empty) to 1.0
(full).
@@ -283,13 +283,13 @@ bool QDeclarativeVideo::hasVideo() const
*/
/*!
- \qmlproperty qreal Video::playbackRate
+ \qmlproperty real Video::playbackRate
This property holds the rate at which video is played at as a multiple of the normal rate.
*/
/*!
- \qmlproperty enum Video::error
+ \qmlproperty enumeration Video::error
This property holds the error state of the video. It can be one of:
@@ -325,7 +325,7 @@ QDeclarativeVideo::Error QDeclarativeVideo::error() const
*/
/*!
- \qmlproperty enum Video::fillMode
+ \qmlproperty enumeration Video::fillMode
Set this property to define how the video is scaled to fit the target area.
diff --git a/src/imports/particles/qdeclarativeparticles.cpp b/src/imports/particles/qdeclarativeparticles.cpp
index 264cba2..ecc6604 100644
--- a/src/imports/particles/qdeclarativeparticles.cpp
+++ b/src/imports/particles/qdeclarativeparticles.cpp
@@ -189,13 +189,13 @@ void QDeclarativeParticleMotionLinear::advance(QDeclarativeParticle &p, int inte
*/
/*!
- \qmlproperty qreal ParticleMotionGravity::xattractor
- \qmlproperty qreal ParticleMotionGravity::yattractor
+ \qmlproperty real ParticleMotionGravity::xattractor
+ \qmlproperty real ParticleMotionGravity::yattractor
These properties hold the x and y coordinates of the point attracting the particles.
*/
/*!
- \qmlproperty qreal ParticleMotionGravity::acceleration
+ \qmlproperty real ParticleMotionGravity::acceleration
This property holds the acceleration to apply to the particles.
*/
@@ -303,14 +303,14 @@ Rectangle {
*/
/*!
- \qmlproperty qreal QDeclarativeParticleMotionWander::xvariance
- \qmlproperty qreal QDeclarativeParticleMotionWander::yvariance
+ \qmlproperty real QDeclarativeParticleMotionWander::xvariance
+ \qmlproperty real QDeclarativeParticleMotionWander::yvariance
These properties set the amount to wander in the x and y directions.
*/
/*!
- \qmlproperty qreal QDeclarativeParticleMotionWander::pace
+ \qmlproperty real QDeclarativeParticleMotionWander::pace
This property holds how quickly the paricles will move from side to side.
*/
@@ -859,7 +859,7 @@ void QDeclarativeParticles::setEmissionRate(int er)
}
/*!
- \qmlproperty qreal Particles::emissionVariance
+ \qmlproperty real Particles::emissionVariance
This property holds how inconsistent the rate of particle emissions are.
It is a number between 0 (no variance) and 1 (some variance).