summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2011-08-31 07:38:52 (GMT)
committerSergio Ahumada <sergio.ahumada@nokia.com>2011-08-31 07:39:36 (GMT)
commit0e10b8dbb7d84694cbdeb57bf42df52b12d79f47 (patch)
treee0968185c3afce109537977c9eb0df4cfd8f6cb7 /src/corelib
parentac51ebee5bcc975829cf59012dfe9bb198016ed1 (diff)
parent5a9000c3aca05e28c4fc537f82d85d6ec4395dc5 (diff)
downloadQt-0e10b8dbb7d84694cbdeb57bf42df52b12d79f47.zip
Qt-0e10b8dbb7d84694cbdeb57bf42df52b12d79f47.tar.gz
Qt-0e10b8dbb7d84694cbdeb57bf42df52b12d79f47.tar.bz2
Merge branch 4.7 into qt-4.8-from-4.7
Conflicts: doc/src/index.qdoc
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/tools/qline.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/tools/qline.cpp b/src/corelib/tools/qline.cpp
index af3b7d5..0f67652 100644
--- a/src/corelib/tools/qline.cpp
+++ b/src/corelib/tools/qline.cpp
@@ -564,8 +564,9 @@ qreal QLineF::length() const
Returns the angle of the line in degrees.
- Positive values for the angles mean counter-clockwise while negative values
- mean the clockwise direction. Zero degrees is at the 3 o'clock position.
+ The return value will be in the range of values from 0.0 up to but not
+ including 360.0. The angles are measured counter-clockwise from a point
+ on the x-axis to the right of the origin (x > 0).
\sa setAngle()
*/