summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-09-27 22:49:56 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-09-28 22:43:21 (GMT)
commite67092d630d795e2cdca6f2be70c7e684a12a67c (patch)
tree540dbabb35ca388f999ede3b574cc7c329a43888 /src/declarative
parentc8b99a9b0a10541503f3e5b49b016862c7bc3ae5 (diff)
downloadQt-e67092d630d795e2cdca6f2be70c7e684a12a67c.zip
Qt-e67092d630d795e2cdca6f2be70c7e684a12a67c.tar.gz
Qt-e67092d630d795e2cdca6f2be70c7e684a12a67c.tar.bz2
Documentation fix for Flickable (mark content properties as real, not int).
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/graphicsitems/qdeclarativeflickable.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 84b0ccf..f9c16b3 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -456,8 +456,8 @@ QDeclarativeFlickable::~QDeclarativeFlickable()
}
/*!
- \qmlproperty int Flickable::contentX
- \qmlproperty int Flickable::contentY
+ \qmlproperty real Flickable::contentX
+ \qmlproperty real Flickable::contentY
These properties hold the surface coordinate currently at the top-left
corner of the Flickable. For example, if you flick an image up 100 pixels,
@@ -1154,8 +1154,8 @@ void QDeclarativeFlickable::setBoundsBehavior(BoundsBehavior b)
}
/*!
- \qmlproperty int Flickable::contentWidth
- \qmlproperty int Flickable::contentHeight
+ \qmlproperty real Flickable::contentWidth
+ \qmlproperty real Flickable::contentHeight
The dimensions of the content (the surface controlled by Flickable). Typically this
should be set to the combined size of the items placed in the Flickable. Note this