diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-06-22 15:32:46 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-27 02:28:40 +0200 |
| commit | a93c2608d69fa385c675a6b49e4d4bfb97f83ed2 (patch) | |
| tree | 88b9bc5b459600d85c6519995367669396787568 /tests/auto/qml/qqmllanguage/data | |
| parent | a2aa4705702256c15aaaf64e08b90c4749233f9d (diff) | |
Add enum values from related types
If moc marks a type as being related to another type (by using that
type's enums or properties), then include the enum values exported
by the related type in those exposed by the dependent type.
Task-number: QTBUG-22675
Change-Id: I78e72791a4f470200a9ba986a865ffac6c873725
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'tests/auto/qml/qqmllanguage/data')
| -rw-r--r-- | tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml b/tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml index 697278e0b7..4d54bc83c1 100644 --- a/tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml +++ b/tests/auto/qml/qqmllanguage/data/assignBasicTypes.qml @@ -1,9 +1,12 @@ import Test 1.0 +import QtQuick 2.0 + MyTypeObject { flagProperty: "FlagVal1 | FlagVal3" enumProperty: "EnumVal2" qtEnumProperty: Qt.RichText mirroredEnumProperty: Qt.AlignHCenter + relatedEnumProperty: "RelatedValue" stringProperty: "Hello World!" uintProperty: 10 intProperty: -19 |