diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 16:12:40 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 16:12:41 +0100 |
| commit | 24e2b39e7a06687322a18a158a083eb51a7c0dca (patch) | |
| tree | 1a32caf6dd6db74fbac9553a094bb00b216fa678 /tests/auto/qml/qqmlecmascript/testtypes.h | |
| parent | 39540124dd0900e0c99dcda8c0ebdf4f3cea8d5e (diff) | |
| parent | daff5f2988cef31442629a48c3b3088abf01837a (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: If9a205bea219b9aca95d78b1e556ca9bbff58dd0
Diffstat (limited to 'tests/auto/qml/qqmlecmascript/testtypes.h')
| -rw-r--r-- | tests/auto/qml/qqmlecmascript/testtypes.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlecmascript/testtypes.h b/tests/auto/qml/qqmlecmascript/testtypes.h index 556cc32fd3..2aef1d644d 100644 --- a/tests/auto/qml/qqmlecmascript/testtypes.h +++ b/tests/auto/qml/qqmlecmascript/testtypes.h @@ -1651,6 +1651,16 @@ public: QML_DECLARE_TYPEINFO(FallbackBindingsTypeObject, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPEINFO(FallbackBindingsTypeDerived, QML_HAS_ATTACHED_PROPERTIES) +class SingletonWithEnum : public QObject +{ + Q_OBJECT + Q_ENUMS(TestEnum) +public: + enum TestEnum { + TestValue = 42 + }; +}; + void registerTypes(); #endif // TESTTYPES_H |