From: Lars Knoll <lars.knoll@digia.com>
Date: Wed, 12 Dec 2012 21:10:50 +0000 (+0100)
Subject: Fix ObjectCtor::call
X-Git-Tag: upstream/5.2.1~669^2~659^2~690
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d6fcbdbf5182dcd549ef685cfeb2e3e90d3e81c7;p=platform%2Fupstream%2Fqtdeclarative.git

Fix ObjectCtor::call

Change-Id: Ifa74ba46ed5213661d009fcd748d66f2b5670814
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---

diff --git a/qv4ecmaobjects.cpp b/qv4ecmaobjects.cpp
index fc428e6..1a95c14 100644
--- a/qv4ecmaobjects.cpp
+++ b/qv4ecmaobjects.cpp
@@ -537,7 +537,9 @@ Value ObjectCtor::construct(ExecutionContext *ctx)
 
 Value ObjectCtor::call(ExecutionContext *ctx)
 {
-    return Value::fromObject(ctx->engine->newObject());
+    if (!ctx->argumentCount || ctx->argument(0).isUndefined() || ctx->argument(0).isNull())
+        return Value::fromObject(ctx->engine->newObject());
+    return __qmljs_to_object(ctx->argument(0), ctx);
 }
 
 Value ObjectCtor::__get__(ExecutionContext *ctx, String *name)