aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickpincharea_p.h
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-03-01 20:09:52 +1000
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-15 22:59:32 +0100
commitb5b46f398c1a04ab443bf22ec08c5efbf72c161e (patch)
treeb7e85e2a81a06719ffc28bc5042c98582557209c /src/quick/items/qquickpincharea_p.h
parent585bce863f4dd4b169111b2af11e50ba9fece92a (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 'src/quick/items/qquickpincharea_p.h')
-rw-r--r--src/quick/items/qquickpincharea_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickpincharea_p.h b/src/quick/items/qquickpincharea_p.h
index 435d3ec538..f3687e0c15 100644
--- a/src/quick/items/qquickpincharea_p.h
+++ b/src/quick/items/qquickpincharea_p.h
@@ -112,7 +112,7 @@ public:
emit maximumRotationChanged();
}
- enum Axis { NoDrag=0x00, XAxis=0x01, YAxis=0x02, XandYAxis=0x03 };
+ enum Axis { NoDrag=0x00, XAxis=0x01, YAxis=0x02, XAndYAxis=0x03, XandYAxis=XAndYAxis };
Axis axis() const { return m_axis; }
void setAxis(Axis a) {
if (a == m_axis)