diff options
| -rw-r--r-- | src/qml/jsruntime/qv4dateobject_p.h | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qjsengine/tst_qjsengine.cpp | 8 | ||||
| -rw-r--r-- | tests/manual/v4/TestExpectations | 5 |
3 files changed, 5 insertions, 10 deletions
diff --git a/src/qml/jsruntime/qv4dateobject_p.h b/src/qml/jsruntime/qv4dateobject_p.h index a56d17f9b1..b32b2c3f66 100644 --- a/src/qml/jsruntime/qv4dateobject_p.h +++ b/src/qml/jsruntime/qv4dateobject_p.h @@ -112,7 +112,7 @@ struct DateCtor: FunctionObject static void call(const Managed *that, Scope &scope, CallData *); }; -struct DatePrototype: DateObject +struct DatePrototype: Object { void init(ExecutionEngine *engine, Object *ctor); diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp index f83fe18621..65ce1bed45 100644 --- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp @@ -566,10 +566,6 @@ void tst_QJSEngine::newDate() QCOMPARE(date.isDate(), true); QCOMPARE(date.isObject(), true); QVERIFY(!date.isCallable()); - // prototype should be Date.prototype - QVERIFY(!date.prototype().isUndefined()); - QCOMPARE(date.prototype().isDate(), true); - QCOMPARE(date.prototype().strictlyEquals(eng.evaluate("Date.prototype")), true); } { @@ -578,10 +574,6 @@ void tst_QJSEngine::newDate() QVERIFY(!date.isUndefined()); QCOMPARE(date.isDate(), true); QCOMPARE(date.isObject(), true); - // prototype should be Date.prototype - QVERIFY(!date.prototype().isUndefined()); - QCOMPARE(date.prototype().isDate(), true); - QCOMPARE(date.prototype().strictlyEquals(eng.evaluate("Date.prototype")), true); QCOMPARE(date.toDateTime(), dt); } diff --git a/tests/manual/v4/TestExpectations b/tests/manual/v4/TestExpectations index f9a898c43d..3d0ffd7116 100644 --- a/tests/manual/v4/TestExpectations +++ b/tests/manual/v4/TestExpectations @@ -128,9 +128,12 @@ S15.10.6.2_A9 failing S15.10.6.3_A9 failing S15.10.6.4_A9 failing -# Object.freeze(v) on a non-object returns v, no longer TypeError +# es6: Object.freeze(v) on a non-object returns v, no longer TypeError 15.2.3.9-1 failing 15.2.3.9-1-1 failing 15.2.3.9-1-2 failing 15.2.3.9-1-3 failing 15.2.3.9-1-4 failing + +# es6: Date.prototype is no longer a DateObject +15.9.5.40_1 failing |