diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-12-11 15:22:50 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-11 16:39:03 +0100 |
| commit | 56936a8440b621d947218d6053f3d70519526cb2 (patch) | |
| tree | e461c88b5dd0a87e1fc7d4c97f99e381c7acf920 /tests | |
| parent | a63f6e0db4f2dfb087c2e7857fa1b58da8799504 (diff) | |
Move the Q_DECLARE_METATYPE to where it should be.
Change-Id: Id17b30ed59fd9e68229bb80de5b9e4bc2aa0b75d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qml/qqmlecmascript/testtypes.h | 1 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmlecmascript/testtypes.h b/tests/auto/qml/qqmlecmascript/testtypes.h index a3a76bf4f1..e0f5317945 100644 --- a/tests/auto/qml/qqmlecmascript/testtypes.h +++ b/tests/auto/qml/qqmlecmascript/testtypes.h @@ -285,6 +285,7 @@ private: int m_intProperty; Qt::MouseButtons m_buttons; }; +Q_DECLARE_METATYPE(QQmlListProperty<MyQmlObject>) QML_DECLARE_TYPEINFO(MyQmlObject, QML_HAS_ATTACHED_PROPERTIES) diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index 048fdb1e16..1cf8e13c3c 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -2854,7 +2854,6 @@ void tst_qqmlecmascript::listToVariant() } // QTBUG-16316 -Q_DECLARE_METATYPE(QQmlListProperty<MyQmlObject>) void tst_qqmlecmascript::listAssignment() { QQmlComponent component(&engine, testFileUrl("listAssignment.qml")); |