diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 10:33:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-10 10:33:34 (GMT) |
| commit | 0d6d25e6796a85ea44d982a8ec618d920371c7a9 (patch) | |
| tree | 71b497a5370b0707b4da324b6918bce7f4901879 /src/declarative/graphicsitems/qdeclarativeitem.cpp | |
| parent | 878c2a984b78cdfc88e4474f6719f07662c7ac68 (diff) | |
| parent | 12d63b05a942281e688d857d17c190564c77b698 (diff) | |
| download | Qt-0d6d25e6796a85ea44d982a8ec618d920371c7a9.zip Qt-0d6d25e6796a85ea44d982a8ec618d920371c7a9.tar.gz Qt-0d6d25e6796a85ea44d982a8ec618d920371c7a9.tar.bz2 | |
Merge remote branch 'qt/4.7' into qml-4.7
Conflicts:
src/declarative/util/qdeclarativestateoperations.cpp
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeitem.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitem.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 7c6c46b..4ba80ad 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -1293,6 +1293,16 @@ QDeclarativeKeysAttached *QDeclarativeKeysAttached::qmlAttachedProperties(QObjec \internal */ +/*! + \fn void QDeclarativeItem::smoothChanged() + \internal +*/ + +/*! + \fn void QDeclarativeItem::clipChanged() + \internal +*/ + /*! \fn void QDeclarativeItem::transformOriginChanged(TransformOrigin) \internal */ |