summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/declarative/drag.qml
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-22 08:24:05 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-22 08:24:05 (GMT)
commite2f90ecdde9550986df1539aa88eb5fc41d939e1 (patch)
tree354e192d83d1ed695373f085faa3a448e2599713 /doc/src/snippets/declarative/drag.qml
parent69b1784edb6dd82f26100d0e539bfa8a65bdd35d (diff)
parent33eb76f050b45718d87926a8ff7afc89d6201c16 (diff)
downloadQt-e2f90ecdde9550986df1539aa88eb5fc41d939e1.zip
Qt-e2f90ecdde9550986df1539aa88eb5fc41d939e1.tar.gz
Qt-e2f90ecdde9550986df1539aa88eb5fc41d939e1.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: Replace QmlList* and QList* support with a single QmlListProperty type Rename MouseRegion -> MouseArea Update QmlChanges with animation API changes. Document the default velocity of EaseFollow Remove use of unexprted private classes. Fix compile error on Solaris Increase durations when testing Behaviors. Add cached path rounded rect painting benchmark. Remove use of direct event posting. Use QTest::keyClick() for keys.
Diffstat (limited to 'doc/src/snippets/declarative/drag.qml')
-rw-r--r--doc/src/snippets/declarative/drag.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/declarative/drag.qml b/doc/src/snippets/declarative/drag.qml
index 8735d0c..8e5b599 100644
--- a/doc/src/snippets/declarative/drag.qml
+++ b/doc/src/snippets/declarative/drag.qml
@@ -6,7 +6,7 @@ Rectangle {
Image {
id: pic; source: "qtlogo-64.png"; anchors.verticalCenter: parent.verticalCenter
opacity: (600.0-pic.x) / 600;
- MouseRegion {
+ MouseArea {
anchors.fill: parent
drag.target: pic
drag.axis: "XAxis"