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>

diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp
index 234dee2..276013e 100644 (file)
--- 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 8b02385..fd3fc4a 100644 (file)
--- 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 12b0f4b..75e4344 100644 (file)
--- 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 fa81838..60b81e0 100644 (file)
--- 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