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/qqmllanguage/testtypes.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'tests/auto/qml/qqmllanguage/testtypes.h') diff --git a/tests/auto/qml/qqmllanguage/testtypes.h b/tests/auto/qml/qqmllanguage/testtypes.h index 1f9a8492d9..bd6205cbdf 100644 --- a/tests/auto/qml/qqmllanguage/testtypes.h +++ b/tests/auto/qml/qqmllanguage/testtypes.h @@ -66,8 +66,6 @@ public: int id; }; -Q_DECLARE_METATYPE(QJSValue) - QT_BEGIN_NAMESPACE #define MyInterface_iid "org.qt-project.Qt.Test.MyInterface" Q_DECLARE_INTERFACE(MyInterface, MyInterface_iid); -- cgit v1.2.3