From da2b7576daa58ad2881e41ad6f0f85ec55db4fd2 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 28 Nov 2014 09:31:10 +0100 Subject: Return Heap::ExecutionContext for currentContext() Change-Id: I155ab996e24d7f36761d2ea62a04774e16469b34 Reviewed-by: Simon Hausmann --- src/qml/qml/v8/qv8engine.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qml/qml/v8/qv8engine.cpp') diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp index 80ef41acca..1002f8c888 100644 --- a/src/qml/qml/v8/qv8engine.cpp +++ b/src/qml/qml/v8/qv8engine.cpp @@ -364,7 +364,7 @@ QV4::ReturnedValue QV8Engine::fromVariant(const QVariant &variant) case QMetaType::Double: return QV4::Encode(*reinterpret_cast(ptr)); case QMetaType::QString: - return m_v4Engine->currentContext()->d()->engine->newString(*reinterpret_cast(ptr))->asReturnedValue(); + return m_v4Engine->currentContext()->engine->newString(*reinterpret_cast(ptr))->asReturnedValue(); case QMetaType::Float: return QV4::Encode(*reinterpret_cast(ptr)); case QMetaType::Short: @@ -657,7 +657,7 @@ QV4::ReturnedValue QV8Engine::metaTypeToJS(int type, const void *data) case QMetaType::Double: return QV4::Encode(*reinterpret_cast(data)); case QMetaType::QString: - return m_v4Engine->currentContext()->d()->engine->newString(*reinterpret_cast(data))->asReturnedValue(); + return m_v4Engine->currentContext()->engine->newString(*reinterpret_cast(data))->asReturnedValue(); case QMetaType::Float: return QV4::Encode(*reinterpret_cast(data)); case QMetaType::Short: -- cgit v1.2.3