diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-12-04 14:13:14 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-04 16:14:13 +0100 |
| commit | 4d6fcff41fa1bedd9f9af68a77ae56792d42d995 (patch) | |
| tree | 61156dd9764ea6b2761e9ad9435a83417ad7276b | |
| parent | 460f310bcce2a5004d59eb7ae4b31a05c724e5ff (diff) | |
Declare QQmlV8Handle as a metatype where it is defined.
Instead of in multiple different TUs, therefore causing ODR violations.
Change-Id: Iefc5f3486961b91dd4e97a462f72570ff49bfd1b
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| -rw-r--r-- | src/qml/qml/qqmlboundsignal.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlpropertycache.cpp | 1 | ||||
| -rw-r--r-- | src/qml/qml/v8/qv8engine_p.h | 2 | ||||
| -rw-r--r-- | src/qml/qml/v8/qv8qobjectwrapper.cpp | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp index 234dee2918..276013e433 100644 --- a/src/qml/qml/qqmlboundsignal.cpp +++ b/src/qml/qml/qqmlboundsignal.cpp @@ -58,8 +58,6 @@ #include <QtCore/qstringbuilder.h> #include <QtCore/qdebug.h> -Q_DECLARE_METATYPE(QQmlV8Handle) - QT_BEGIN_NAMESPACE static QQmlJavaScriptExpression::VTable QQmlBoundSignalExpression_jsvtable = { diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index 8b023855ab..fd3fc4a356 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -62,7 +62,6 @@ #endif Q_DECLARE_METATYPE(QJSValue) -Q_DECLARE_METATYPE(QQmlV8Handle); QT_BEGIN_NAMESPACE diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h index 12b0f4b6a1..75e4344fee 100644 --- a/src/qml/qml/v8/qv8engine_p.h +++ b/src/qml/qml/v8/qv8engine_p.h @@ -642,4 +642,6 @@ QV8Engine::Deletable *QV8Engine::extensionData(int index) const QT_END_NAMESPACE +Q_DECLARE_METATYPE(QQmlV8Handle) + #endif // QQMLV8ENGINE_P_H diff --git a/src/qml/qml/v8/qv8qobjectwrapper.cpp b/src/qml/qml/v8/qv8qobjectwrapper.cpp index fa818388fe..60b81e02e2 100644 --- a/src/qml/qml/v8/qv8qobjectwrapper.cpp +++ b/src/qml/qml/v8/qv8qobjectwrapper.cpp @@ -63,7 +63,6 @@ #include <QtCore/qatomic.h> Q_DECLARE_METATYPE(QJSValue); -Q_DECLARE_METATYPE(QQmlV8Handle); QT_BEGIN_NAMESPACE |