summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-11-01 18:23:22 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-11-01 18:23:22 (GMT)
commit621431fe5128c6d61095dc6cf92d8b34c4c4284b (patch)
tree112c17ab31f63647c7f11f48aeb8a55667300ca3 /src/corelib/tools
parent067e3fb0868814351829647358dea583d28d010e (diff)
parent1575462bf90851fb134db4892e93c04b396543f1 (diff)
downloadQt-621431fe5128c6d61095dc6cf92d8b34c4c4284b.zip
Qt-621431fe5128c6d61095dc6cf92d8b34c4c4284b.tar.gz
Qt-621431fe5128c6d61095dc6cf92d8b34c4c4284b.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Missing icon in the designer documentation Fridge magnet example code snippet error qpaintdevice-qt3.html documentation errors QWebElement example missed information QSPlitter style-sheet example was invalid Errors in QSqlDriver::handle examples QGLColormap example was invalid QPointer made no mention of QWeakPointer Invalid links to http://developer.symbian.org QNetworkDiskCache documentation missed information QStyleSheet example used a property that is hidden. QList document referenced to non existing function QXmlQuery::bindVariable documentation bug Fix multiple typos in QLineF documentation. Qmake project file docs lacked information. Documentation error in SSL document Fix multiple typos in documentation. Fix for QVector::toList - code example documentation.
Diffstat (limited to 'src/corelib/tools')
-rw-r--r--src/corelib/tools/qline.cpp9
-rw-r--r--src/corelib/tools/qlist.cpp4
2 files changed, 8 insertions, 5 deletions
diff --git a/src/corelib/tools/qline.cpp b/src/corelib/tools/qline.cpp
index 9c7c243..7e3dd34 100644
--- a/src/corelib/tools/qline.cpp
+++ b/src/corelib/tools/qline.cpp
@@ -488,7 +488,8 @@ bool QLineF::isNull() const
/*!
\fn qreal QLineF::dx() const
- Returns the horizontal component of the line's vector.
+ Returns the horizontal component of the line's vector.
+ Return value is positive if x2() >= x1() and negative if x2() < x1().
\sa dy(), pointAt()
*/
@@ -497,6 +498,7 @@ bool QLineF::isNull() const
\fn qreal QLineF::dy() const
Returns the vertical component of the line's vector.
+ Return value is positive if y2() >= y1() and negative if y2() < y1().
\sa dx(), pointAt()
*/
@@ -506,7 +508,8 @@ bool QLineF::isNull() const
Sets the length of the line to the given \a length. QLineF will
move the end point - p2() - of the line to give the line its new length.
-
+ If the given \a length is negative the angle() is also changed.
+
If the line is a null line, the length will remain zero regardless
of the length specified.
@@ -762,7 +765,7 @@ QLineF::IntersectType QLineF::intersect(const QLineF &l, QPointF *intersectionPo
\since 4.4
- Returns the angle (in degrees) from this line to the given \a
+ Returns the angle (in positive degrees) from this line to the given \a
line, taking the direction of the lines into account. If the lines
do not intersect within their range, it is the intersection point of
the extended lines that serves as origin (see
diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp
index 18bfe24..2e95ef8 100644
--- a/src/corelib/tools/qlist.cpp
+++ b/src/corelib/tools/qlist.cpp
@@ -469,8 +469,8 @@ void **QListData::erase(void **xi)
\snippet doc/src/snippets/code/src_corelib_tools_qlistdata.cpp 0
Qt includes a QStringList class that inherits QList\<QString\>
- and adds a few convenience functions, such as QStringList::join()
- and QStringList::find(). (QString::split() creates QStringLists
+ and adds a convenience function QStringList::join().
+ (QString::split() creates QStringLists
from strings.)
QList stores a list of items. The default constructor creates an