diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-11 16:28:17 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 13:13:33 +0200 |
| commit | bdb27b96acbd38531879378c48959a5a1cd60963 (patch) | |
| tree | 056f2c8c35be97a9564dee5d0ea65bed7265b7ce /src/quick/items/context2d | |
| parent | 8d26084ae56ba5aedd73ab733553dbf9cb3eb672 (diff) | |
Use ReturnedValue for Managed::get().
Change-Id: Ia8f35d227b69d32e1f6a041283abbbd083aa34ca
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/quick/items/context2d')
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2d.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index f17b3d45e6..81f5505245 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -68,6 +68,7 @@ #include <private/qv4value_p.h> #include <private/qv4functionobject_p.h> #include <private/qv4objectproto_p.h> +#include <private/qv4scopedvalue_p.h> #if defined(Q_OS_QNX) || defined(Q_OS_ANDROID) #include <ctype.h> @@ -1673,6 +1674,7 @@ QV4::Value QQuickJSContext2DPrototype::method_createPattern(QV4::SimpleCallConte QV8Engine *engine = ctx->engine->v8Engine; QV4::ExecutionEngine *v4 = QV8Engine::getV4(engine); + QV4::Scope scope(v4); if (ctx->argumentCount == 2) { QQuickContext2DStyle *pattern = new (v4->memoryManager) QQuickContext2DStyle(v4); @@ -1689,8 +1691,8 @@ QV4::Value QQuickJSContext2DPrototype::method_createPattern(QV4::SimpleCallConte QImage patternTexture; if (QV4::Object *o = ctx->arguments[0].asObject()) { - QQuickJSContext2DPixelData *pixelData = o->get(ctx->engine->newString(QStringLiteral("data"))).as<QQuickJSContext2DPixelData>(); - if (pixelData) { + QV4::Scoped<QQuickJSContext2DPixelData> pixelData(scope, o->get(ctx->engine->newString(QStringLiteral("data")))); + if (!!pixelData) { patternTexture = pixelData->image; } } else { |