diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-12-04 14:24:43 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-04 16:14:19 +0100 |
| commit | 964d9496ad0cb9af5a75d3f2588ece3d6a5f9062 (patch) | |
| tree | 56001e211e2a38d58efc510daaf7a12fdd325875 /tests | |
| parent | 4d6fcff41fa1bedd9f9af68a77ae56792d42d995 (diff) | |
Declare QJSValue as a metatype where it is defined.
Instead of in multiple different TUs, therefore causing ODR violations.
Change-Id: I08d3624d3ed5a995e96488361665afa197fb9fc9
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qml/qjsvalue/tst_qjsvalue.h | 1 | ||||
| -rw-r--r-- | tests/auto/qml/qjsvalueiterator/tst_qjsvalueiterator.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlecmascript/testtypes.h | 1 | ||||
| -rw-r--r-- | tests/auto/qml/qqmllanguage/testtypes.h | 2 | ||||
| -rw-r--r-- | tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp | 3 | ||||
| -rw-r--r-- | tests/benchmarks/qml/js/qjsvalue/tst_qjsvalue.cpp | 2 |
6 files changed, 0 insertions, 11 deletions
diff --git a/tests/auto/qml/qjsvalue/tst_qjsvalue.h b/tests/auto/qml/qjsvalue/tst_qjsvalue.h index fa0aad7a51..ab9a5ed771 100644 --- a/tests/auto/qml/qjsvalue/tst_qjsvalue.h +++ b/tests/auto/qml/qjsvalue/tst_qjsvalue.h @@ -49,7 +49,6 @@ #include <QtTest/QtTest> Q_DECLARE_METATYPE(QVariant) -Q_DECLARE_METATYPE(QJSValue) class tst_QJSValue : public QObject { 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 <QJSValue> #include <QJSValueIterator> -Q_DECLARE_METATYPE(QJSValue); - class tst_QJSValueIterator : public QObject { Q_OBJECT diff --git a/tests/auto/qml/qqmlecmascript/testtypes.h b/tests/auto/qml/qqmlecmascript/testtypes.h index aa00115f5e..a3a76bf4f1 100644 --- a/tests/auto/qml/qqmlecmascript/testtypes.h +++ b/tests/auto/qml/qqmlecmascript/testtypes.h @@ -696,7 +696,6 @@ public: } }; -Q_DECLARE_METATYPE(QJSValue); class MyInvokableBaseObject : public QObject { Q_OBJECT 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); 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 |