summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-25 16:35:57 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-25 16:35:57 (GMT)
commit50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5 (patch)
tree7517568b333bcc5679e7a165c48aaa7bd06a66fb /src/gui/graphicsview
parent61f013168e5ef5111948a1ae0a1464753986adb2 (diff)
parentce40a078caa4a09793128ca730cc5ca268aeee87 (diff)
downloadQt-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.zip
Qt-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.tar.gz
Qt-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/gui/graphicsview')
-rw-r--r--src/gui/graphicsview/qgraphicsitem_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h
index 8480c19..1b7aa97 100644
--- a/src/gui/graphicsview/qgraphicsitem_p.h
+++ b/src/gui/graphicsview/qgraphicsitem_p.h
@@ -722,7 +722,7 @@ public:
/*!
Returns true if \a item1 is on top of \a item2.
- The items dont need to be siblings.
+ The items don't need to be siblings.
\internal
*/
@@ -776,7 +776,7 @@ inline bool qt_closestItemFirst(const QGraphicsItem *item1, const QGraphicsItem
/*!
Returns true if \a item2 is on top of \a item1.
- The items dont need to be siblings.
+ The items don't need to be siblings.
\internal
*/