From 964d9496ad0cb9af5a75d3f2588ece3d6a5f9062 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
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 <jedrzej.nowacki@digia.com>
---
 src/qml/qml/qqmlpropertycache.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/qml/qml/qqmlpropertycache.cpp')

diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp
index fd3fc4a356..9922a82c3d 100644
--- a/src/qml/qml/qqmlpropertycache.cpp
+++ b/src/qml/qml/qqmlpropertycache.cpp
@@ -61,8 +61,6 @@
 #  pragma warning( disable : 4200 )
 #endif
 
-Q_DECLARE_METATYPE(QJSValue)
-
 QT_BEGIN_NAMESPACE
 
 #define Q_INT16_MAX 32767
-- 
cgit v1.2.3