From 964d9496ad0cb9af5a75d3f2588ece3d6a5f9062 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 4 Dec 2012 14:24:43 +0100 Subject: Declare QJSValue as a metatype where it is defined. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of in multiple different TUs, therefore causing ODR violations. Change-Id: I08d3624d3ed5a995e96488361665afa197fb9fc9 Reviewed-by: Jędrzej Nowacki --- tests/auto/qml/qjsvalueiterator/tst_qjsvalueiterator.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'tests/auto/qml/qjsvalueiterator') diff --git a/tests/auto/qml/qjsvalueiterator/tst_qjsvalueiterator.cpp b/tests/auto/qml/qjsvalueiterator/tst_qjsvalueiterator.cpp index 7648836b54..987f060b20 100644 --- a/tests/auto/qml/qjsvalueiterator/tst_qjsvalueiterator.cpp +++ b/tests/auto/qml/qjsvalueiterator/tst_qjsvalueiterator.cpp @@ -46,8 +46,6 @@ #include #include -Q_DECLARE_METATYPE(QJSValue); - class tst_QJSValueIterator : public QObject { Q_OBJECT -- cgit v1.2.3