summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-02-22 11:06:19 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-02-22 11:06:19 (GMT)
commit88259a37599cad4756299d729b9a733cf4b0e528 (patch)
treefee3e864a507b19680d3087177685d5250a057e4
parent2c9417fadf4205c4fcb602ca17b4d729c5466020 (diff)
downloadQt-88259a37599cad4756299d729b9a733cf4b0e528.zip
Qt-88259a37599cad4756299d729b9a733cf4b0e528.tar.gz
Qt-88259a37599cad4756299d729b9a733cf4b0e528.tar.bz2
doc: Fixed some qdoc errors.
-rw-r--r--src/declarative/util/qmlanimation.cpp4
-rw-r--r--src/multimedia/qml/qmlaudio.cpp6
-rw-r--r--src/multimedia/qml/qmlgraphicsvideo.cpp6
-rw-r--r--src/multimedia/qml/qsoundeffect.cpp2
-rw-r--r--src/plugins/mediaservices/gstreamer/qgstreamerbushelper.cpp2
5 files changed, 10 insertions, 10 deletions
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 00299e7..6c9d13f 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -1528,7 +1528,7 @@ void QmlRotationAnimation::setTo(qreal t)
Possible values are Numerical, Clockwise, Counterclockwise,
or Shortest.
- \list
+ \table
\row
\o Numerical
\o Rotate by linearly interpolating between the two numbers.
@@ -1543,7 +1543,7 @@ void QmlRotationAnimation::setTo(qreal t)
\o Shortest
\o Rotate in the direction that produces the shortest animation path.
A rotation from 10 to 350 will rotate 20 degrees counterclockwise.
- \list
+ \endtable
The default direction is Shortest.
*/
diff --git a/src/multimedia/qml/qmlaudio.cpp b/src/multimedia/qml/qmlaudio.cpp
index 5719050..89f045e 100644
--- a/src/multimedia/qml/qmlaudio.cpp
+++ b/src/multimedia/qml/qmlaudio.cpp
@@ -280,7 +280,7 @@ QmlAudio::Status QmlAudio::status() const
*/
/*!
- \qmlproperty qreal playbackRate
+ \qmlproperty qreal Audio::playbackRate
This property holds the rate at which audio is played at as a multiple of the normal rate.
*/
@@ -313,9 +313,9 @@ QmlAudio::Error QmlAudio::error() const
*/
/*!
- \qmlproperty Audio::onError(error, errorString)
+ \qmlsignal Audio::onError(error, errorString)
- This property is called when an \l {Error}{error} has occurred. The errorString parameter
+ This handler is called when an \l {Error}{error} has occurred. The errorString parameter
may contain more detailed information about the error.
*/
diff --git a/src/multimedia/qml/qmlgraphicsvideo.cpp b/src/multimedia/qml/qmlgraphicsvideo.cpp
index fde505d..7289f4d 100644
--- a/src/multimedia/qml/qmlgraphicsvideo.cpp
+++ b/src/multimedia/qml/qmlgraphicsvideo.cpp
@@ -280,7 +280,7 @@ bool QmlGraphicsVideo::hasVideo() const
*/
/*!
- \qmlproperty qreal playbackRate
+ \qmlproperty qreal Video::playbackRate
This property holds the rate at which video is played at as a multiple of the normal rate.
*/
@@ -314,9 +314,9 @@ QmlGraphicsVideo::Error QmlGraphicsVideo::error() const
*/
/*!
- \qmlproperty Video::onError(error, errorString)
+ \qmlsignal Video::onError(error, errorString)
- This property is called when an \l {Error}{error} has occurred. The errorString parameter
+ This handler is called when an \l {Error}{error} has occurred. The errorString parameter
may contain more detailed information about the error.
*/
diff --git a/src/multimedia/qml/qsoundeffect.cpp b/src/multimedia/qml/qsoundeffect.cpp
index 1f2c801..c2e2989 100644
--- a/src/multimedia/qml/qsoundeffect.cpp
+++ b/src/multimedia/qml/qsoundeffect.cpp
@@ -71,7 +71,7 @@
playSound.play()
}
}
- \endeml
+ \endqml
\sa SoundEffect
*/
diff --git a/src/plugins/mediaservices/gstreamer/qgstreamerbushelper.cpp b/src/plugins/mediaservices/gstreamer/qgstreamerbushelper.cpp
index 4649c21..59ae5be 100644
--- a/src/plugins/mediaservices/gstreamer/qgstreamerbushelper.cpp
+++ b/src/plugins/mediaservices/gstreamer/qgstreamerbushelper.cpp
@@ -174,7 +174,7 @@ static GstBusSyncReply syncGstBusFilter(GstBus* bus, GstMessage* message, QGstre
/*!
- \class gstreamer::QGstreamerBusHelper
+ \class QGstreamerBusHelper
\internal
*/