diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-09-01 11:07:47 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-09-01 11:07:47 (GMT) |
| commit | 63129c8bd21bfdc8110680296bb3bc1ab5e43343 (patch) | |
| tree | 0b797ce849c191942713b618068aba0619788d57 /src/gui/graphicsview/qgraphicsitem.cpp | |
| parent | d3b898e973662707f9644b4fe5f8d18849929723 (diff) | |
| parent | dcb98430f6add24c9d54253bd35d35010cc75c23 (diff) | |
| download | Qt-63129c8bd21bfdc8110680296bb3bc1ab5e43343.zip Qt-63129c8bd21bfdc8110680296bb3bc1ab5e43343.tar.gz Qt-63129c8bd21bfdc8110680296bb3bc1ab5e43343.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 882def7..72ddcef 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -7758,18 +7758,21 @@ void QGraphicsItemPrivate::resetHeight() } /*! - \property QGraphicsObject::children - \internal + \property QGraphicsObject::children + \since 4.7 + \internal */ /*! - \property QGraphicsObject::width - \internal + \property QGraphicsObject::width + \since 4.7 + \internal */ /*! - \property QGraphicsObject::height - \internal + \property QGraphicsObject::height + \since 4.7 + \internal */ /*! @@ -7985,24 +7988,6 @@ void QGraphicsItemPrivate::resetHeight() */ /*! - \property QGraphicsObject::children - \since 4.7 - \internal -*/ - -/*! - \property QGraphicsObject::width - \since 4.7 - \internal -*/ - -/*! - \property QGraphicsObject::height - \since 4.7 - \internal -*/ - -/*! \class QAbstractGraphicsShapeItem \brief The QAbstractGraphicsShapeItem class provides a common base for all path items. |