diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-23 21:21:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-23 21:21:51 (GMT) |
| commit | b0e73713e0142ac1045b4c91c7fe55e8e965b7c2 (patch) | |
| tree | 36e2d759460559e030b0dec09de7f9465f609260 /src/gui | |
| parent | 0727c544915427372951b1c30715a09e473ec494 (diff) | |
| parent | 22c482836b57540df89df261cdd5f9c4dadf0daa (diff) | |
| download | Qt-b0e73713e0142ac1045b4c91c7fe55e8e965b7c2.zip Qt-b0e73713e0142ac1045b4c91c7fe55e8e965b7c2.tar.gz Qt-b0e73713e0142ac1045b4c91c7fe55e8e965b7c2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
qdoc: Cleaned up the TOC for QML element pages.
qdoc: Cleaned up the Inherits and Inherited by lines for QML elements.
doc: Added missing \since 4.7 to effect propertyu.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 56182d1..5fffefb 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -7957,6 +7957,7 @@ void QGraphicsItemPrivate::resetHeight() /*! \property QGraphicsObject::effect + \since 4.7 \brief the effect attached to this item \sa QGraphicsItem::setGraphicsEffect(), QGraphicsItem::graphicsEffect() |