diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-11 16:03:12 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-11 16:03:12 +0200 |
commit | f9949f501890a7f8289fcbda85d3a4085bdbb21a (patch) | |
tree | 759e57bb3ed156e46a98c3a4223951c3edc55d43 /src/declarative/qml/qdeclarativemetatype.cpp | |
parent | 1ddef09c351f2899b1662ddd1de190c0d0a8b7bf (diff) | |
parent | 3e0c19d5ba0e4826c3f036c3172d8ea0e30530a6 (diff) |
Merge branch 'master' into refactor
Conflicts:
src/declarative/declarative.pro
src/imports/gestures/gestures.pro
src/imports/inputcontext/inputcontext.pro
src/qtquick1/graphicsitems/qdeclarativeitem.cpp
src/qtquick1/qtquick1.pro
Change-Id: I782be7090d8b6da9c890bc8e778722da93da8037
Diffstat (limited to 'src/declarative/qml/qdeclarativemetatype.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativemetatype.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp index c5cc23de7c..a989ae847b 100644 --- a/src/declarative/qml/qdeclarativemetatype.cpp +++ b/src/declarative/qml/qdeclarativemetatype.cpp @@ -61,7 +61,7 @@ #include <qvector.h> #include <qlocale.h> #include <QtCore/qcryptographichash.h> -#include <QtScript/qscriptvalue.h> +#include <QtDeclarative/qjsvalue.h> #include <ctype.h> @@ -1114,7 +1114,7 @@ QT_END_NAMESPACE #include <QtGui/qquaternion.h> #include <private/qv8engine_p.h> -Q_DECLARE_METATYPE(QScriptValue); +Q_DECLARE_METATYPE(QJSValue); Q_DECLARE_METATYPE(QDeclarativeV8Handle); QT_BEGIN_NAMESPACE @@ -1195,7 +1195,7 @@ bool QDeclarativeMetaType::canCopy(int type) default: if (type == qMetaTypeId<QVariant>() || - type == qMetaTypeId<QScriptValue>() || + type == qMetaTypeId<QJSValue>() || type == qMetaTypeId<QDeclarativeV8Handle>() || typeCategory(type) != Unknown) { return true; @@ -1416,8 +1416,8 @@ bool QDeclarativeMetaType::copy(int type, void *data, const void *copy) if (type == qMetaTypeId<QVariant>()) { *static_cast<NS(QVariant) *>(data) = *static_cast<const NS(QVariant)*>(copy); return true; - } else if (type == qMetaTypeId<QScriptValue>()) { - *static_cast<NS(QScriptValue) *>(data) = *static_cast<const NS(QScriptValue)*>(copy); + } else if (type == qMetaTypeId<QJSValue>()) { + *static_cast<NS(QJSValue) *>(data) = *static_cast<const NS(QJSValue)*>(copy); return true; } else if (type == qMetaTypeId<QDeclarativeV8Handle>()) { *static_cast<NS(QDeclarativeV8Handle) *>(data) = *static_cast<const NS(QDeclarativeV8Handle)*>(copy); @@ -1626,8 +1626,8 @@ bool QDeclarativeMetaType::copy(int type, void *data, const void *copy) if (type == qMetaTypeId<QVariant>()) { *static_cast<NS(QVariant) *>(data) = NS(QVariant)(); return true; - } else if (type == qMetaTypeId<QScriptValue>()) { - *static_cast<NS(QScriptValue) *>(data) = NS(QScriptValue)(); + } else if (type == qMetaTypeId<QJSValue>()) { + *static_cast<NS(QJSValue) *>(data) = NS(QJSValue)(); return true; } else if (type == qMetaTypeId<QDeclarativeV8Handle>()) { *static_cast<NS(QDeclarativeV8Handle) *>(data) = NS(QDeclarativeV8Handle)(); |