From dfca0ef6ee9c8725bc111dadf1d5addd12f23944 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@digia.com>
Date: Fri, 11 Oct 2013 13:29:44 +0200
Subject: Correctly set the vtbl for Boolean and NumberObject

Also accept a boolean primitive as input to
Boolean.prototype.valueOf()

Change-Id: I5b94d8d65b86e26860b9844eb4bf823577c8e924
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 src/qml/jsruntime/qv4booleanobject.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/qml/jsruntime/qv4booleanobject.cpp')

diff --git a/src/qml/jsruntime/qv4booleanobject.cpp b/src/qml/jsruntime/qv4booleanobject.cpp
index d4d6201c01..025f98351f 100644
--- a/src/qml/jsruntime/qv4booleanobject.cpp
+++ b/src/qml/jsruntime/qv4booleanobject.cpp
@@ -95,7 +95,9 @@ ReturnedValue BooleanPrototype::method_toString(SimpleCallContext *ctx)
 
 ReturnedValue BooleanPrototype::method_valueOf(SimpleCallContext *ctx)
 {
-    // ### Shouldn't this work for a boolean thisObject?
+    if (ctx->callData->thisObject.isBoolean())
+        return ctx->callData->thisObject.asReturnedValue();
+
     Scope scope(ctx);
     Scoped<BooleanObject> thisObject(scope, ctx->callData->thisObject);
     if (!thisObject)
-- 
cgit v1.2.3