From 56936a8440b621d947218d6053f3d70519526cb2 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 11 Dec 2012 15:22:50 +0100 Subject: [PATCH] Move the Q_DECLARE_METATYPE to where it should be. Change-Id: Id17b30ed59fd9e68229bb80de5b9e4bc2aa0b75d Reviewed-by: Lars Knoll --- tests/auto/qml/qqmlecmascript/testtypes.h | 1 + tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qml/qqmlecmascript/testtypes.h b/tests/auto/qml/qqmlecmascript/testtypes.h index a3a76bf..e0f5317 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) 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 048fdb1..1cf8e13 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) void tst_qqmlecmascript::listAssignment() { QQmlComponent component(&engine, testFileUrl("listAssignment.qml")); -- 2.7.4