aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickitem.cpp
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2012-08-28 11:21:19 +1000
committerQt by Nokia <qt-info@nokia.com>2012-08-28 06:21:58 +0200
commit87679b3499e68957998b98bf13b6d98b3aa8b4c3 (patch)
tree4e6d613173a1e6abf5ef0afc65a615fd6b7fdbfe /src/quick/items/qquickitem.cpp
parentabaee0a83588f86740ea553ff7623a789b6b787a (diff)
Docs - add missing images and code, clean up sections
Includes the removal of concepts/modelviewsdata/localstorage.qdoc since that is a duplicate of the existing Local Storage module docs. Also removes classes from whatsnew.qdoc that are internal. Change-Id: I4170c1797bbec09bb67784b0b2ad67fd990365a8 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
-rw-r--r--src/quick/items/qquickitem.cpp16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 3d55f52e1b..1bea8a81d9 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -1689,6 +1689,11 @@ void QQuickItemPrivate::updateSubFocusItem(QQuickItem *scope, bool focus)
*/
/*!
+ \class QQuickItem::ItemChangeData
+ \internal
+*/
+
+/*!
\enum QQuickItem::TransformOrigin
Controls the point about which simple transforms like scale apply.
@@ -3803,7 +3808,7 @@ QQmlListProperty<QQuickState> QQuickItemPrivate::states()
See \l{Qt Quick States} and \l{Animation and Transitions in Qt Quick} for
more details on using states and transitions.
- \sa transitions
+ \sa states
*/
/*!
\property QQuickItem::transitions
@@ -3871,6 +3876,9 @@ void QQuickItem::setState(const QString &state)
\property QQuickItem::transform
\internal
*/
+/*!
+ \internal
+ */
QQmlListProperty<QQuickTransform> QQuickItem::transform()
{
return QQmlListProperty<QQuickTransform>(this, 0, QQuickItemPrivate::transform_append,
@@ -6263,6 +6271,12 @@ void QQuickItem::setKeepTouchGrab(bool keep)
}
/*!
+ \qmlmethod object QtQuick2::Item::contains(point point)
+
+ Returns true if this item contains \a point, which is in local coordinates;
+ returns false otherwise.
+ */
+/*!
Returns true if this item contains \a point, which is in local coordinates;
returns false otherwise.