diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-26 21:42:57 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-26 21:42:57 (GMT) |
| commit | e028a54690f2fedfae6da19fb24b7401e4a71e56 (patch) | |
| tree | 72c038e84d9fb1063c970a121949d898442c5648 /src/corelib | |
| parent | d54407928be05781ede2358baba2f2f91749cc80 (diff) | |
| parent | 6661f5c2222c145d854e225076195b37672637d2 (diff) | |
| download | Qt-e028a54690f2fedfae6da19fb24b7401e4a71e56.zip Qt-e028a54690f2fedfae6da19fb24b7401e4a71e56.tar.gz Qt-e028a54690f2fedfae6da19fb24b7401e4a71e56.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Conflicts:
doc/src/index.qdoc
src/xmlpatterns/expr/qevaluationcache_p.h
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qline.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/tools/qline.cpp b/src/corelib/tools/qline.cpp index 0f67652..af3b7d5 100644 --- a/src/corelib/tools/qline.cpp +++ b/src/corelib/tools/qline.cpp @@ -564,9 +564,8 @@ qreal QLineF::length() const Returns the angle of the line in degrees. - 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). + Positive values for the angles mean counter-clockwise while negative values + mean the clockwise direction. Zero degrees is at the 3 o'clock position. \sa setAngle() */ |