diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-05-07 09:15:32 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-05-07 09:15:32 (GMT) |
| commit | 695ddc4a13233c8e6f626fa205336f90f8c5a565 (patch) | |
| tree | 88da8a1d80219e5788db3f4e138d1d281bb3d816 /examples/declarative/mousearea/mouse.qml | |
| parent | 1824eb63f6b2f8baa26b20c57fc50db84eefaa30 (diff) | |
| parent | 67bf465253db71c0eddbc6ffcb811dd65c00b207 (diff) | |
| download | Qt-695ddc4a13233c8e6f626fa205336f90f8c5a565.zip Qt-695ddc4a13233c8e6f626fa205336f90f8c5a565.tar.gz Qt-695ddc4a13233c8e6f626fa205336f90f8c5a565.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
examples/declarative/dynamic/qml/itemCreation.js
Diffstat (limited to 'examples/declarative/mousearea/mouse.qml')
| -rw-r--r-- | examples/declarative/mousearea/mouse.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/declarative/mousearea/mouse.qml b/examples/declarative/mousearea/mouse.qml index 67302a8..06134b7 100644 --- a/examples/declarative/mousearea/mouse.qml +++ b/examples/declarative/mousearea/mouse.qml @@ -33,7 +33,7 @@ Rectangle { MouseArea { anchors.fill: parent drag.target: parent - drag.axis: "XAxis" + drag.axis: Drag.XAxis drag.minimumX: 0 drag.maximumX: 150 |