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>
---
 tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp | 3 ---
 tests/benchmarks/qml/js/qjsvalue/tst_qjsvalue.cpp   | 2 --
 2 files changed, 5 deletions(-)

(limited to 'tests/benchmarks')

diff --git a/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp b/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp
index fb684685c3..587d9d47e9 100644
--- a/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp
+++ b/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp
@@ -43,9 +43,6 @@
 #include <QtQml/qjsvalue.h>
 #include <QtQml/qjsengine.h>
 
-
-Q_DECLARE_METATYPE(QJSValue)
-
 class tst_QJSEngine : public QObject
 {
     Q_OBJECT
diff --git a/tests/benchmarks/qml/js/qjsvalue/tst_qjsvalue.cpp b/tests/benchmarks/qml/js/qjsvalue/tst_qjsvalue.cpp
index 738bdf619a..7b2dc3a08d 100644
--- a/tests/benchmarks/qml/js/qjsvalue/tst_qjsvalue.cpp
+++ b/tests/benchmarks/qml/js/qjsvalue/tst_qjsvalue.cpp
@@ -43,8 +43,6 @@
 #include <QtQml/qjsvalue.h>
 #include <QtQml/qjsengine.h>
 
-Q_DECLARE_METATYPE(QJSValue)
-
 class tst_QJSValue : public QObject
 {
     Q_OBJECT
-- 
cgit v1.2.3