diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-07 16:50:54 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-07 16:50:54 (GMT) |
| commit | 77fb7ffa69fe0183e8547fca69fc976364d05408 (patch) | |
| tree | 09f76b374f5dfbb8177bbe26397299acfcfa8eaa /src | |
| parent | a127b7221ebdcb119e9102aea1905c99ddd6d41c (diff) | |
| parent | 703d85e8991e2061062f6d7c695cdeb45d9661fd (diff) | |
| download | Qt-77fb7ffa69fe0183e8547fca69fc976364d05408.zip Qt-77fb7ffa69fe0183e8547fca69fc976364d05408.tar.gz Qt-77fb7ffa69fe0183e8547fca69fc976364d05408.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Always call QPainter::end() before using the object drawn to.
Doc: Reworded a brief description for clarity.
Doc: Added a small note about using .pro files in SUBDIRS.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index fc122d2..7a5b8de 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -10900,8 +10900,8 @@ QVariant QGraphicsSimpleTextItem::extension(const QVariant &variant) const /*! \class QGraphicsItemGroup - \brief The QGraphicsItemGroup class provides treating a group of items as - one. + \brief The QGraphicsItemGroup class provides a container that treats + a group of items as a single item. \since 4.2 \ingroup graphicsview-api |