aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmllanguage/data/globalEnums.qml
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2012-03-16 10:31:53 +1000
committerQt by Nokia <qt-info@nokia.com>2012-03-21 01:10:52 +0100
commit16c192831164c9ed9a8a4601936bb32fdba645ac (patch)
treee823222a1824c76a3db2a3cbb915d6e1fa8417d6 /tests/auto/qml/qqmllanguage/data/globalEnums.qml
parent37cd29b2ff024f27f84ef6214ff5403603d522f2 (diff)
Support unregistered Qt namespace enums in QML methods.
This brings the support in line with signal handlers, which should allow us to reuse the implementation there when appropriate. Also adds tests for both registered and unregisted Qt namespace enums. Change-Id: I366846626fc44d6d99b51e93fc9e3cb948c748f9 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'tests/auto/qml/qqmllanguage/data/globalEnums.qml')
-rw-r--r--tests/auto/qml/qqmllanguage/data/globalEnums.qml12
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmllanguage/data/globalEnums.qml b/tests/auto/qml/qqmllanguage/data/globalEnums.qml
index 102102a6c0..d36eb845f8 100644
--- a/tests/auto/qml/qqmllanguage/data/globalEnums.qml
+++ b/tests/auto/qml/qqmllanguage/data/globalEnums.qml
@@ -19,13 +19,25 @@ Item {
bValue = newValue;
}
+ onValueCChanged: {
+ cValue = newValue;
+ }
+
+ onValueDChanged: {
+ dValue = newValue;
+ }
+
property int aValue: 0
property int bValue: 0
+ property int cValue: 0
+ property int dValue: 0
}
function setEnumValues() {
enum1Class.setValue(MyEnum1Class.A_13);
enumDerivedClass.setValueA(MyEnum1Class.A_11);
enumDerivedClass.setValueB(MyEnum2Class.B_37);
+ enumDerivedClass.setValueC(Qt.RichText);
+ enumDerivedClass.setValueD(Qt.ElideMiddle);
}
}