summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-11-04 04:16:57 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-11-04 04:16:57 (GMT)
commit120134ec588a6edf572df8d1fae40013753d233e (patch)
tree3cd78f46a5ffb72408c9fc4e3267095ccec1957a /doc/src
parente042014961636d459dc84df93ad2cca96049e2d1 (diff)
parent684fe7af0b6d8133973132fd5b6b01cc16957a10 (diff)
downloadQt-120134ec588a6edf572df8d1fae40013753d233e.zip
Qt-120134ec588a6edf572df8d1fae40013753d233e.tar.gz
Qt-120134ec588a6edf572df8d1fae40013753d233e.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/globalobject.qdoc3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc
index f1d440f..06f6bdc 100644
--- a/doc/src/declarative/globalobject.qdoc
+++ b/doc/src/declarative/globalobject.qdoc
@@ -114,6 +114,9 @@ This function returns a color 50% darker than \c baseColor. See QColor::lighter(
\image declarative-rect_tint.png
Tint is most useful when a subtle change is intended to be conveyed due to some event; you can then use tinting to more effectively tune the visible color.
+\section3 Qt.closestAngle(number fromAngle, number toAngle)
+This function returns an equivalent angle to toAngle, such that the difference between fromAngle and toAngle is never more than 180 degrees. This is useful when animating angles using a NumberAnimation, which does not know about equivalent angles, when you always want to take the shortest path.
+
\section3 Qt.playSound(url soundLocation)
This function plays the audio file located at \c soundLocation. Only .wav files are supported.