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 /src/qml/qml/qqmlvmemetaobject.cpp | |
| 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 'src/qml/qml/qqmlvmemetaobject.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp index 14d25b6a5e..8dc9943ddc 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp @@ -53,8 +53,6 @@ #include <private/qv8variantresource_p.h> #include <private/qqmlglobal_p.h> -Q_DECLARE_METATYPE(QJSValue); - QT_BEGIN_NAMESPACE QQmlVMEVariantQObjectPtr::QQmlVMEVariantQObjectPtr(bool isVar) |