aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4arrayobject.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/qml/jsruntime/qv4arrayobject.cpp')
-rw-r--r--src/qml/jsruntime/qv4arrayobject.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp
index c316a3196e..60e7afdaec 100644
--- a/src/qml/jsruntime/qv4arrayobject.cpp
+++ b/src/qml/jsruntime/qv4arrayobject.cpp
@@ -41,6 +41,7 @@
#include "qv4arrayobject_p.h"
#include "qv4sparsearray_p.h"
+#include "qv4objectproto_p.h"
using namespace QV4;
@@ -133,7 +134,14 @@ Value ArrayPrototype::method_isArray(SimpleCallContext *ctx)
Value ArrayPrototype::method_toString(SimpleCallContext *ctx)
{
- return method_join(ctx);
+ QV4::Object *o = ctx->thisObject.toObject(ctx);
+ FunctionObject *f = o->get(ctx->engine->newString("join")).asFunctionObject();
+ if (f) {
+ CALLDATA(0);
+ d.thisObject = ctx->thisObject;
+ return f->call(d);
+ }
+ return ObjectPrototype::method_toString(ctx);
}
Value ArrayPrototype::method_toLocaleString(SimpleCallContext *ctx)