aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlecmascript/data/enums.3.qml
diff options
context:
space:
mode:
authorChris Adams <christopher.adams@nokia.com>2012-03-15 17:09:13 +1000
committerQt by Nokia <qt-info@nokia.com>2012-03-21 05:18:35 +0100
commit4c9d326230a2c522bc8fd80eee9664c7d0c1205f (patch)
tree3e7e9fcc2a78d852b961b6b2c54ffe8e5c414dd0 /tests/auto/qml/qqmlecmascript/data/enums.3.qml
parentb2722ab31e524fc223a332fc0574e4b66c716b20 (diff)
Allow literal enum to int property assignments
Previously, enum to int property assignments were considered bindings. This commit adds support for assigning enum values to int properties as enums. Note that to use an enum in QML, it must have been declared with Q_ENUMS or otherwise registered as a metatype. Enum values from the global Qt object are also usable. Task-number: QTBUG-23403 Change-Id: I50db6cae54a24400ea472bde43619d547e4ceb78 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'tests/auto/qml/qqmlecmascript/data/enums.3.qml')
-rw-r--r--tests/auto/qml/qqmlecmascript/data/enums.3.qml41
1 files changed, 41 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlecmascript/data/enums.3.qml b/tests/auto/qml/qqmlecmascript/data/enums.3.qml
new file mode 100644
index 0000000000..c77d635a1e
--- /dev/null
+++ b/tests/auto/qml/qqmlecmascript/data/enums.3.qml
@@ -0,0 +1,41 @@
+import QtQuick 2.0
+import Qt.test 1.0
+import Qt.test 1.0 as Namespace
+
+Item {
+ // Enums from type
+ property int a: Item.Center
+ property int b: Item.Right
+
+ // Enums from Qt
+ property int c: Qt.blue
+ property int d: Qt.darkRed
+
+ // Enums from other type
+ property int e: MyQmlObject.EnumValue3
+ property int f: MyQmlObject.EnumValue4
+
+ // Enums from namespaced other type
+ property int h: Namespace.MyQmlObject.EnumValue3
+ property int i: Namespace.MyQmlObject.EnumValue4
+
+ // Count the onChanged signals to see whether
+ // they're assigned as literals or via bindings
+ property int ac: 0
+ property int bc: 0
+ property int cc: 0
+ property int dc: 0
+ property int ec: 0
+ property int fc: 0
+ property int hc: 0
+ property int ic: 0
+
+ onAChanged: ac++
+ onBChanged: bc++
+ onCChanged: cc++
+ onDChanged: dc++
+ onEChanged: ec++
+ onFChanged: fc++
+ onHChanged: hc++
+ onIChanged: ic++
+}