diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-09-24 14:28:02 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 09:05:25 +0200 |
commit | 9062476491dd1c81f63bb7a3ae6e6a080db1db1e (patch) | |
tree | 362935aece4c4c4fd62f15ef14b61c048bcc514c /src/qml/qml/qqmlvaluetypewrapper.cpp | |
parent | 0f204625dc6720d40df22ca352af995af5448525 (diff) |
Make parts of qv8engine_p.h GC safe
Change-Id: Iaa15423cedc307a09b3cd7287272d93d7a604caf
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlvaluetypewrapper.cpp')
-rw-r--r-- | src/qml/qml/qqmlvaluetypewrapper.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp index f1d2f3a85c..ba3cfc0801 100644 --- a/src/qml/qml/qqmlvaluetypewrapper.cpp +++ b/src/qml/qml/qqmlvaluetypewrapper.cpp @@ -252,7 +252,7 @@ ReturnedValue QmlValueTypeWrapper::method_toString(SimpleCallContext *ctx) if (w->objectType == QmlValueTypeWrapper::Reference) { QmlValueTypeReference *reference = static_cast<QmlValueTypeReference *>(w); if (reference->object && readReferenceValue(reference)) { - return w->v8->toString(w->type->toString()).asReturnedValue(); + return w->v8->toString(w->type->toString()); } else { return QV4::Encode::undefined(); } @@ -260,7 +260,7 @@ ReturnedValue QmlValueTypeWrapper::method_toString(SimpleCallContext *ctx) Q_ASSERT(w->objectType == QmlValueTypeWrapper::Copy); QmlValueTypeCopy *copy = static_cast<QmlValueTypeCopy *>(w); w->type->setValue(copy->value); - return w->v8->toString(w->type->toString()).asReturnedValue(); + return w->v8->toString(w->type->toString()); } } @@ -310,14 +310,14 @@ ReturnedValue QmlValueTypeWrapper::get(Managed *m, const StringRef name, bool *h cpptype v; \ void *args[] = { &v, 0 }; \ r->type->qt_metacall(QMetaObject::ReadProperty, result->coreIndex, args); \ - return constructor(v).asReturnedValue(); \ + return constructor(v); \ } // These four types are the most common used by the value type wrappers - VALUE_TYPE_LOAD(QMetaType::QReal, qreal, QV4::Value::fromDouble); - VALUE_TYPE_LOAD(QMetaType::Int, int, QV4::Value::fromInt32); + VALUE_TYPE_LOAD(QMetaType::QReal, qreal, QV4::Encode); + VALUE_TYPE_LOAD(QMetaType::Int, int, QV4::Encode); VALUE_TYPE_LOAD(QMetaType::QString, QString, r->v8->toString); - VALUE_TYPE_LOAD(QMetaType::Bool, bool, QV4::Value::fromBoolean); + VALUE_TYPE_LOAD(QMetaType::Bool, bool, QV4::Encode); QVariant v(result->propType, (void *)0); void *args[] = { v.data(), 0 }; |