qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Stephen Kelly 2012-12-04 14:24:43 +01:00 committed by The Qt Project
parent 4d6fcff41f
commit 964d9496ad
17 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qml/qml/qqmlcompiler.cpp
View File

@ -76,7 +76,6 @@ Q_DECLARE_METATYPE(QList<qreal>)
Q_DECLARE_METATYPE(QList<bool>)
Q_DECLARE_METATYPE(QList<QString>)
Q_DECLARE_METATYPE(QList<QUrl>)
Q_DECLARE_METATYPE(QJSValue)
QT_BEGIN_NAMESPACE

1
src/qml/qml/qqmlproperty.cpp
View File

@ -64,7 +64,6 @@
#include <math.h>
Q_DECLARE_METATYPE(QJSValue)
Q_DECLARE_METATYPE(QList<int>)
Q_DECLARE_METATYPE(QList<qreal>)
Q_DECLARE_METATYPE(QList<bool>)

2
src/qml/qml/qqmlpropertycache.cpp
View File

@ -61,8 +61,6 @@
# pragma warning( disable : 4200 )
#endif
Q_DECLARE_METATYPE(QJSValue)
QT_BEGIN_NAMESPACE
#define Q_INT16_MAX 32767

2
src/qml/qml/qqmlvmemetaobject.cpp
View File

@ -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)

2
src/qml/qml/v4/qv4bindings.cpp
View File

@ -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 )

2
src/qml/qml/v4/qv4compiler.cpp
View File

@ -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)

2
src/qml/qml/v4/qv4irbuilder.cpp
View File

@ -48,8 +48,6 @@
DEFINE_BOOL_CONFIG_OPTION(qmlVerboseCompiler, QML_VERBOSE_COMPILER)
Q_DECLARE_METATYPE(QJSValue)
QT_BEGIN_NAMESPACE
using namespace QQmlJS;

1
src/qml/qml/v8/qjsengine.cpp
View File

@ -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>)

2
src/qml/qml/v8/qjsvalue.h
View File

@ -155,6 +155,8 @@ private:
QT_END_NAMESPACE
Q_DECLARE_METATYPE(QJSValue)
QT_END_HEADER
#endif

1
src/qml/qml/v8/qv8engine.cpp
View File

@ -63,7 +63,6 @@
#include <QtCore/qjsonobject.h>
#include <QtCore/qjsonvalue.h>
Q_DECLARE_METATYPE(QJSValue)
Q_DECLARE_METATYPE(QList<int>)

2
src/qml/qml/v8/qv8qobjectwrapper.cpp
View File

@ -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)

1
tests/auto/qml/qjsvalue/tst_qjsvalue.h
View File

@ -49,7 +49,6 @@
#include <QtTest/QtTest>
Q_DECLARE_METATYPE(QVariant)
Q_DECLARE_METATYPE(QJSValue)
class tst_QJSValue : public QObject
{

2
tests/auto/qml/qjsvalueiterator/tst_qjsvalueiterator.cpp
View File

@ -46,8 +46,6 @@
#include <QJSValue>
#include <QJSValueIterator>
Q_DECLARE_METATYPE(QJSValue);
class tst_QJSValueIterator : public QObject
{
Q_OBJECT

1
tests/auto/qml/qqmlecmascript/testtypes.h
View File

@ -696,7 +696,6 @@ public:
}
};
Q_DECLARE_METATYPE(QJSValue);
class MyInvokableBaseObject : public QObject
{
Q_OBJECT

2
tests/auto/qml/qqmllanguage/testtypes.h
View File

@ -66,8 +66,6 @@ public:
int id;
};
Q_DECLARE_METATYPE(QJSValue)
QT_BEGIN_NAMESPACE
#define MyInterface_iid "org.qt-project.Qt.Test.MyInterface"
Q_DECLARE_INTERFACE(MyInterface, MyInterface_iid);

3
tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp
View File

@ -43,9 +43,6 @@
#include <QtQml/qjsvalue.h>
#include <QtQml/qjsengine.h>
Q_DECLARE_METATYPE(QJSValue)
class tst_QJSEngine : public QObject
{
Q_OBJECT

2
tests/benchmarks/qml/js/qjsvalue/tst_qjsvalue.cpp
View File

@ -43,8 +43,6 @@
#include <QtQml/qjsvalue.h>
#include <QtQml/qjsengine.h>
Q_DECLARE_METATYPE(QJSValue)
class tst_QJSValue : public QObject
{
Q_OBJECT