aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
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/imports
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/imports')
-rw-r--r--src/imports/qtquick2/plugins.qmltypes4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes
index 12ea9334f8..e5381629cc 100644
--- a/src/imports/qtquick2/plugins.qmltypes
+++ b/src/imports/qtquick2/plugins.qmltypes
@@ -880,7 +880,7 @@ Module {
values: {
"XAxis": 1,
"YAxis": 2,
- "XandYAxis": 3
+ "XAndYAxis": 3
}
}
Property { name: "target"; type: "QQuickItem"; isPointer: true }
@@ -2337,7 +2337,7 @@ Module {
"NoDrag": 0,
"XAxis": 1,
"YAxis": 2,
- "XandYAxis": 3
+ "XAndYAxis": 3
}
}
Property { name: "target"; type: "QQuickItem"; isPointer: true }