1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp
index 5397ad43c5..df648ba9ee 100644
--- a/src/qml/jsruntime/qv4dateobject.cpp
+++ b/src/qml/jsruntime/qv4dateobject.cpp
@@ -466,7 +466,7 @@ static inline double ParseString(const QString &s)
                 if (format < Minute || format >= TimezoneHour)
                     error = true;
                 format = TimezoneHour;
-            } else if (*ch == 'Z' || *ch == 0) {
+            } else if (*ch == 'Z' || ch->unicode() == 0) {
                 format = Done;
             }
             current = 0;
@@ -565,7 +565,7 @@ static inline QString ToString(double t)
 {
     if (std::isnan(t))
         return QStringLiteral("Invalid Date");
-    QString str = ToDateTime(t, Qt::LocalTime).toString() + QStringLiteral(" GMT");
+    QString str = ToDateTime(t, Qt::LocalTime).toString() + QLatin1String(" GMT");
     double tzoffset = LocalTZA + DaylightSavingTA(t);
     if (tzoffset) {
         int hours = static_cast<int>(::fabs(tzoffset) / 1000 / 60 / 60);
@@ -651,9 +651,8 @@ Heap::DateCtor::DateCtor(QV4::ExecutionContext *scope)
 {
 }
 
-ReturnedValue DateCtor::construct(const Managed *m, CallData *callData)
+void DateCtor::construct(const Managed *, Scope &scope, CallData *callData)
 {
-    Scope scope(static_cast<const DateCtor *>(m)->engine());
     double t = 0;
 
     if (callData->argc == 0)
@@ -687,13 +686,13 @@ ReturnedValue DateCtor::construct(const Managed *m, CallData *callData)
         t = TimeClip(UTC(t));
     }
 
-    return Encode(scope.engine->newDateObject(Primitive::fromDouble(t)));
+    scope.result = Encode(scope.engine->newDateObject(Primitive::fromDouble(t)));
 }
 
-ReturnedValue DateCtor::call(const Managed *m, CallData *)
+void DateCtor::call(const Managed *m, Scope &scope, CallData *)
 {
     double t = currentTime();
-    return static_cast<const DateCtor *>(m)->engine()->newString(ToString(t))->asReturnedValue();
+    scope.result = static_cast<const DateCtor *>(m)->engine()->newString(ToString(t));
 }
 
 void DatePrototype::init(ExecutionEngine *engine, Object *ctor)
@@ -1311,7 +1310,8 @@ ReturnedValue DatePrototype::method_toJSON(CallContext *ctx)
 
     ScopedCallData callData(scope);
     callData->thisObject = ctx->thisObject();
-    return toIso->call(callData);
+    toIso->call(scope, callData);
+    return scope.result.asReturnedValue();
 }
 
 void DatePrototype::timezoneUpdated()