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/v4 | |
| 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/v4')
| -rw-r--r-- | src/qml/qml/v4/qv4bindings.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/v4/qv4compiler.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/v4/qv4irbuilder.cpp | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/src/qml/qml/v4/qv4bindings.cpp b/src/qml/qml/v4/qv4bindings.cpp index 84bdbfda7a..48b2ad948a 100644 --- a/src/qml/qml/v4/qv4bindings.cpp +++ b/src/qml/qml/v4/qv4bindings.cpp @@ -68,8 +68,6 @@ #include <QtCore/qmath.h> #include <math.h> // ::fmod -Q_DECLARE_METATYPE(QJSValue) - #ifdef Q_CC_MSVC // MSVC2010 warns about 'unreferenced formal parameter', even if it's used in p->~T() # pragma warning( disable : 4100 ) diff --git a/src/qml/qml/v4/qv4compiler.cpp b/src/qml/qml/v4/qv4compiler.cpp index 2b01acbddf..c12d59d420 100644 --- a/src/qml/qml/v4/qv4compiler.cpp +++ b/src/qml/qml/v4/qv4compiler.cpp @@ -50,8 +50,6 @@ #include <private/qqmlaccessors_p.h> #include <private/qqmljsengine_p.h> -Q_DECLARE_METATYPE(QJSValue) - QT_BEGIN_NAMESPACE DEFINE_BOOL_CONFIG_OPTION(bindingsDump, QML_BINDINGS_DUMP) diff --git a/src/qml/qml/v4/qv4irbuilder.cpp b/src/qml/qml/v4/qv4irbuilder.cpp index 29abd51a81..567906b1be 100644 --- a/src/qml/qml/v4/qv4irbuilder.cpp +++ b/src/qml/qml/v4/qv4irbuilder.cpp @@ -48,8 +48,6 @@ DEFINE_BOOL_CONFIG_OPTION(qmlVerboseCompiler, QML_VERBOSE_COMPILER) -Q_DECLARE_METATYPE(QJSValue) - QT_BEGIN_NAMESPACE using namespace QQmlJS; |