diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-06-14 10:18:45 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-21 04:13:17 +0200 |
| commit | 09b605ddcc33575316211156ff5979aa92e7e1fd (patch) | |
| tree | 61141ac9323983a1ddbbad7602db0687b8d11a5c /tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml | |
| parent | 58f3f50c43f021ebfe214062562498d02b6f2071 (diff) | |
Enable literal Qt enum assignment to enum properties.
Assigning Qt global enums to enum properties was previously handled as
a binding, rather than a literal assignment.
Change-Id: If6bb65f63b34f4e10c0636221ddadb11f7025735
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml')
| -rw-r--r-- | tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml b/tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml index 28a340128d..697278e0b7 100644 --- a/tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml +++ b/tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml @@ -2,6 +2,8 @@ import Test 1.0 MyTypeObject { flagProperty: "FlagVal1 | FlagVal3" enumProperty: "EnumVal2" + qtEnumProperty: Qt.RichText + mirroredEnumProperty: Qt.AlignHCenter stringProperty: "Hello World!" uintProperty: 10 intProperty: -19 @@ -25,4 +27,10 @@ MyTypeObject { urlProperty: "main.qml?with%3cencoded%3edata" objectProperty: MyTypeObject { intProperty: 8 } + + property bool qtEnumTriggeredChange: false + onQtEnumPropertyChanged: qtEnumTriggeredChange = true + + property bool mirroredEnumTriggeredChange: false + onMirroredEnumPropertyChanged: mirroredEnumTriggeredChange = true } |