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/auto/qml/qqmllanguage/testtypes.h | |
| 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/auto/qml/qqmllanguage/testtypes.h')
| -rw-r--r-- | tests/auto/qml/qqmllanguage/testtypes.h | 2 |
1 files changed, 0 insertions, 2 deletions
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); |