set calledAsConstructor to true when function is called as constructor

2 files changed, 5 insertions, 0 deletions

diff --git a/src/script/bridge/qscriptclassobject.cpp b/src/script/bridge/qscriptclassobject.cpp
index e173ebc..512c00e 100644
--- a/src/script/bridge/qscriptclassobject.cpp
+++ b/src/script/bridge/qscriptclassobject.cpp
@@ -45,6 +45,8 @@
 
 #include "../api/qscriptengine.h"
 #include "../api/qscriptengine_p.h"
+#include "../api/qscriptcontext.h"
+#include "../api/qscriptcontext_p.h"
 #include "../api/qscriptclass.h"
 #include "../api/qscriptclasspropertyiterator.h"
 
@@ -240,6 +242,7 @@ JSC::JSObject* ClassObjectDelegate::construct(JSC::ExecState *exec, JSC::JSObjec
     QScriptEnginePrivate *eng_p = scriptEngineFromExec(exec);
     JSC::ExecState *previousFrame = eng_p->currentFrame;
     QScriptContext *ctx = eng_p->contextForFrame(exec);
+    QScriptContextPrivate::get(ctx)->calledAsConstructor = true;
     eng_p->currentFrame = exec;
     QScriptValue defaultObject = ctx->thisObject();
     QScriptValue result = qvariant_cast<QScriptValue>(scriptClass->extension(QScriptClass::Callable, qVariantFromValue(ctx)));
diff --git a/src/script/bridge/qscriptfunction.cpp b/src/script/bridge/qscriptfunction.cpp
index ef97f6f..777bd3b 100644
--- a/src/script/bridge/qscriptfunction.cpp
+++ b/src/script/bridge/qscriptfunction.cpp
@@ -143,6 +143,7 @@ JSC::JSObject* FunctionWrapper::proxyConstruct(JSC::ExecState *exec, JSC::JSObje
     QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(self->data->engine);
     JSC::ExecState *previousFrame = eng_p->currentFrame;
     QScriptContext *ctx = eng_p->contextForFrame(exec);
+    QScriptContextPrivate::get(ctx)->calledAsConstructor = true;
     eng_p->currentFrame = exec;
 
     //We might have nested eval inside our function so we should create another scope
@@ -213,6 +214,7 @@ JSC::JSObject* FunctionWithArgWrapper::proxyConstruct(JSC::ExecState *exec, JSC:
     QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(self->data->engine);
     JSC::ExecState *previousFrame = eng_p->currentFrame;
     QScriptContext *ctx = eng_p->contextForFrame(exec);
+    QScriptContextPrivate::get(ctx)->calledAsConstructor = true;
     eng_p->currentFrame = exec;
 
     //We might have nested eval inside our function so we should create another scope