aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-09-13 08:37:49 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-18 13:13:52 +0200
commit399f88f6b75bb842be8e9d3671ace5114e115542 (patch)
treeca2db5fdcf8e7cbe43b81c26f339453c0025d2e5
parentce5dee24226f6abacaffe298092afe035d0822c4 (diff)
Fix regression in Object.isExtensible()
We need to encode a bool, but the extensible flag in Object is a bitfield (ie uint). Change-Id: I2461c8ae90e92840da737c0c7ee88b9a2cee21e3 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
-rw-r--r--src/qml/jsruntime/qv4objectproto.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp
index 0d168ea814..da66b2436b 100644
--- a/src/qml/jsruntime/qv4objectproto.cpp
+++ b/src/qml/jsruntime/qv4objectproto.cpp
@@ -344,7 +344,7 @@ ReturnedValue ObjectPrototype::method_isExtensible(SimpleCallContext *ctx)
ctx->throwTypeError();
Object *o = ctx->argument(0).objectValue();
- return Encode(o->extensible);
+ return Encode((bool)o->extensible);
}
ReturnedValue ObjectPrototype::method_keys(SimpleCallContext *ctx)