Merge branch 'stable' into dev

Conflicts:
	.qmake.conf

Change-Id: I10d4f9e993d23750a6e8ddc1291b79e47fc83c64

1 files changed, 2 insertions, 2 deletions

diff --git a/src/qml/jsruntime/qv4sequenceobject_p.h b/src/qml/jsruntime/qv4sequenceobject_p.h
index 3bbb86f231..54a96863df 100644
--- a/src/qml/jsruntime/qv4sequenceobject_p.h
+++ b/src/qml/jsruntime/qv4sequenceobject_p.h
@@ -69,12 +69,12 @@ struct SequencePrototype : public QV4::Object
 
     void init();
 
-    static ReturnedValue method_valueOf(QV4::SimpleCallContext *ctx)
+    static ReturnedValue method_valueOf(QV4::CallContext *ctx)
     {
         return ctx->callData->thisObject.toString(ctx)->asReturnedValue();
     }
 
-    static ReturnedValue method_sort(QV4::SimpleCallContext *ctx);
+    static ReturnedValue method_sort(QV4::CallContext *ctx);
 
     static bool isSequenceType(int sequenceTypeId);
     static ReturnedValue newSequence(QV4::ExecutionEngine *engine, int sequenceTypeId, QObject *object, int propertyIndex, bool *succeeded);