diff options
Diffstat (limited to 'src/qml/qml/v8')
-rw-r--r-- | src/qml/qml/v8/qjsengine.cpp | 1 | ||||
-rw-r--r-- | src/qml/qml/v8/qjsvalue.h | 2 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8engine.cpp | 1 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8qobjectwrapper.cpp | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/src/qml/qml/v8/qjsengine.cpp b/src/qml/qml/v8/qjsengine.cpp index 5bb6db16e0..9698ed5e8a 100644 --- a/src/qml/qml/v8/qjsengine.cpp +++ b/src/qml/qml/v8/qjsengine.cpp @@ -68,7 +68,6 @@ #define Q_D(blah) #define Q_Q(blah) -Q_DECLARE_METATYPE(QJSValue) Q_DECLARE_METATYPE(QObjectList) Q_DECLARE_METATYPE(QList<int>) diff --git a/src/qml/qml/v8/qjsvalue.h b/src/qml/qml/v8/qjsvalue.h index 9223e57ee4..d13be2b8cc 100644 --- a/src/qml/qml/v8/qjsvalue.h +++ b/src/qml/qml/v8/qjsvalue.h @@ -155,6 +155,8 @@ private: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QJSValue) + QT_END_HEADER #endif diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp index 1544b0717b..806e3690b3 100644 --- a/src/qml/qml/v8/qv8engine.cpp +++ b/src/qml/qml/v8/qv8engine.cpp @@ -63,7 +63,6 @@ #include <QtCore/qjsonobject.h> #include <QtCore/qjsonvalue.h> -Q_DECLARE_METATYPE(QJSValue) Q_DECLARE_METATYPE(QList<int>) diff --git a/src/qml/qml/v8/qv8qobjectwrapper.cpp b/src/qml/qml/v8/qv8qobjectwrapper.cpp index 60b81e02e2..eac8c93c08 100644 --- a/src/qml/qml/v8/qv8qobjectwrapper.cpp +++ b/src/qml/qml/v8/qv8qobjectwrapper.cpp @@ -62,8 +62,6 @@ #include <QtCore/qtimer.h> #include <QtCore/qatomic.h> -Q_DECLARE_METATYPE(QJSValue); - QT_BEGIN_NAMESPACE #if defined(__GNUC__) && !defined(__INTEL_COMPILER) |