diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2012-03-01 20:09:52 +1000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-15 22:59:32 +0100 |
commit | b5b46f398c1a04ab443bf22ec08c5efbf72c161e (patch) | |
tree | b7e85e2a81a06719ffc28bc5042c98582557209c /examples | |
parent | 585bce863f4dd4b169111b2af11e50ba9fece92a (diff) |
Add a hidden XandYAxis enum value
For Qt 5 XandYAxis is being renamed to XAndYAxis to more consistently
follow capitalization rules. Add an undocumented XandYAxis variable to
ease porting.
Change-Id: Id9e41dd5578373f5f557937da889a9326ff12e53
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/quick/animation/behaviors/wigglytext.qml | 2 | ||||
-rw-r--r-- | examples/quick/mousearea/mousearea.qml | 2 | ||||
-rw-r--r-- | examples/quick/touchinteraction/flickable/content/Panel.qml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/quick/animation/behaviors/wigglytext.qml b/examples/quick/animation/behaviors/wigglytext.qml index 13d04d539c..1bafebcebc 100644 --- a/examples/quick/animation/behaviors/wigglytext.qml +++ b/examples/quick/animation/behaviors/wigglytext.qml @@ -96,7 +96,7 @@ Rectangle { MouseArea { anchors.fill: parent - drag.target: letter; drag.axis: Drag.XandYAxis + drag.target: letter; drag.axis: Drag.XAndYAxis onPressed: letter.color = "#dddddd" onReleased: letter.color = "#999999" } diff --git a/examples/quick/mousearea/mousearea.qml b/examples/quick/mousearea/mousearea.qml index fb912af7b5..efadfcfed3 100644 --- a/examples/quick/mousearea/mousearea.qml +++ b/examples/quick/mousearea/mousearea.qml @@ -152,7 +152,7 @@ Rectangle { anchors.fill: parent //! [drag] drag.target: blueSquare - drag.axis: Drag.XandYAxis + drag.axis: Drag.XAndYAxis drag.minimumX: 0 drag.maximumX: box.width - parent.width drag.minimumY: 0 diff --git a/examples/quick/touchinteraction/flickable/content/Panel.qml b/examples/quick/touchinteraction/flickable/content/Panel.qml index 29189780a2..6932fca431 100644 --- a/examples/quick/touchinteraction/flickable/content/Panel.qml +++ b/examples/quick/touchinteraction/flickable/content/Panel.qml @@ -111,7 +111,7 @@ Component { id: mouse anchors.fill: parent drag.target: stickyPage - drag.axis: Drag.XandYAxis + drag.axis: Drag.XAndYAxis drag.minimumY: 0 drag.maximumY: page.height - 80 drag.minimumX: 100 |