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 --- src/qml/qml/qqmlproperty.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/qml/qml/qqmlproperty.cpp') diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index a2bd3742aa..62539b71e9 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -64,7 +64,6 @@ #include -Q_DECLARE_METATYPE(QJSValue) Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(QList) -- cgit v1.2.3