diff --git a/qmljs_objects.cpp b/qmljs_objects.cpp index a387ca74c4..d5ac054da3 100644 --- a/qmljs_objects.cpp +++ b/qmljs_objects.cpp @@ -119,19 +119,25 @@ void Object::defineDefaultProperty(ExecutionContext *context, const QString &nam defineDefaultProperty(context->engine->identifier(name), value); } -void Object::defineDefaultProperty(ExecutionContext *context, const QString &name, Value (*code)(ExecutionContext *), int count) +void Object::defineDefaultProperty(ExecutionContext *context, const QString &name, Value (*code)(ExecutionContext *), int argumentCount) { - Q_UNUSED(count); - // ### FIX count + Q_UNUSED(argumentCount); String *s = context->engine->identifier(name); - defineDefaultProperty(s, Value::fromObject(context->engine->newNativeFunction(context, s, code))); + FunctionObject* function = context->engine->newNativeFunction(context, s, code); + function->defineReadonlyProperty(context->engine, context->engine->id_length, Value::fromInt32(argumentCount)); + defineDefaultProperty(s, Value::fromObject(function)); } void Object::defineReadonlyProperty(ExecutionEngine *engine, const QString &name, Value value) +{ + defineReadonlyProperty(engine, engine->identifier(name), value); +} + +void Object::defineReadonlyProperty(ExecutionEngine *engine, String *name, Value value) { if (!members) members.reset(new PropertyTable()); - PropertyDescriptor *pd = members->insert(engine->identifier(name)); + PropertyDescriptor *pd = members->insert(name); pd->type = PropertyDescriptor::Data; pd->writable = PropertyDescriptor::Disabled; pd->enumberable = PropertyDescriptor::Disabled; diff --git a/qmljs_objects.h b/qmljs_objects.h index dfc2fe432a..91e4e56384 100644 --- a/qmljs_objects.h +++ b/qmljs_objects.h @@ -146,6 +146,7 @@ struct Object: Managed { void defineDefaultProperty(ExecutionContext *context, const QString &name, Value (*code)(ExecutionContext *), int count = 0); /* Fixed: Writable: false, Enumerable: false, Configurable: false */ void defineReadonlyProperty(ExecutionEngine *engine, const QString &name, Value value); + void defineReadonlyProperty(ExecutionEngine *engine, String *name, Value value); protected: virtual void getCollectables(QVector &objects); diff --git a/qv4ecmaobjects.cpp b/qv4ecmaobjects.cpp index fd3383a258..0f06bbddaf 100644 --- a/qv4ecmaobjects.cpp +++ b/qv4ecmaobjects.cpp @@ -555,27 +555,27 @@ Value ObjectCtor::__get__(ExecutionContext *ctx, String *name, bool *hasProperty void ObjectPrototype::init(ExecutionContext *ctx, const Value &ctor) { ctor.objectValue()->defineDefaultProperty(ctx->engine->id_prototype, Value::fromObject(this)); - ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("getPrototypeOf"), method_getPrototypeOf, 0); - ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("getOwnPropertyDescriptor"), method_getOwnPropertyDescriptor, 0); - ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("getOwnPropertyNames"), method_getOwnPropertyNames, 0); - ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("create"), method_create, 0); - ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("defineProperty"), method_defineProperty, 0); - ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("defineProperties"), method_defineProperties, 0); - ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("seal"), method_seal, 0); - ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("freeze"), method_freeze, 0); - ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("preventExtensions"), method_preventExtensions, 0); - ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("isSealed"), method_isSealed, 0); - ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("isFrozen"), method_isFrozen, 0); - ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("isExtensible"), method_isExtensible, 0); - ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("keys"), method_keys, 0); + ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("getPrototypeOf"), method_getPrototypeOf, 1); + ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("getOwnPropertyDescriptor"), method_getOwnPropertyDescriptor, 2); + ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("getOwnPropertyNames"), method_getOwnPropertyNames, 1); + ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("create"), method_create, 2); + ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("defineProperty"), method_defineProperty, 3); + ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("defineProperties"), method_defineProperties, 2); + ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("seal"), method_seal, 1); + ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("freeze"), method_freeze, 1); + ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("preventExtensions"), method_preventExtensions, 1); + ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("isSealed"), method_isSealed, 1); + ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("isFrozen"), method_isFrozen, 1); + ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("isExtensible"), method_isExtensible, 1); + ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("keys"), method_keys, 1); defineDefaultProperty(ctx, QStringLiteral("constructor"), ctor); defineDefaultProperty(ctx, QStringLiteral("toString"), method_toString, 0); defineDefaultProperty(ctx, QStringLiteral("toLocaleString"), method_toLocaleString, 0); defineDefaultProperty(ctx, QStringLiteral("valueOf"), method_valueOf, 0); - defineDefaultProperty(ctx, QStringLiteral("hasOwnProperty"), method_hasOwnProperty, 0); - defineDefaultProperty(ctx, QStringLiteral("isPrototypeOf"), method_isPrototypeOf, 0); - defineDefaultProperty(ctx, QStringLiteral("propertyIsEnumerable"), method_propertyIsEnumerable, 0); + defineDefaultProperty(ctx, QStringLiteral("hasOwnProperty"), method_hasOwnProperty, 1); + defineDefaultProperty(ctx, QStringLiteral("isPrototypeOf"), method_isPrototypeOf, 1); + defineDefaultProperty(ctx, QStringLiteral("propertyIsEnumerable"), method_propertyIsEnumerable, 1); defineDefaultProperty(ctx, QStringLiteral("__defineGetter__"), method_defineGetter, 0); defineDefaultProperty(ctx, QStringLiteral("__defineSetter__"), method_defineSetter, 0); } @@ -1017,24 +1017,24 @@ Value StringCtor::call(ExecutionContext *ctx) void StringPrototype::init(ExecutionContext *ctx, const Value &ctor) { ctor.objectValue()->defineDefaultProperty(ctx->engine->id_prototype, Value::fromObject(this)); - ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("fromCharCode"), method_fromCharCode); + ctor.objectValue()->defineDefaultProperty(ctx, QStringLiteral("fromCharCode"), method_fromCharCode, 1); defineDefaultProperty(ctx, QStringLiteral("constructor"), ctor); defineDefaultProperty(ctx, QStringLiteral("toString"), method_toString); defineDefaultProperty(ctx, QStringLiteral("valueOf"), method_valueOf); - defineDefaultProperty(ctx, QStringLiteral("charAt"), method_charAt); - defineDefaultProperty(ctx, QStringLiteral("charCodeAt"), method_charCodeAt); - defineDefaultProperty(ctx, QStringLiteral("concat"), method_concat); - defineDefaultProperty(ctx, QStringLiteral("indexOf"), method_indexOf); - defineDefaultProperty(ctx, QStringLiteral("lastIndexOf"), method_lastIndexOf); - defineDefaultProperty(ctx, QStringLiteral("localeCompare"), method_localeCompare); - defineDefaultProperty(ctx, QStringLiteral("match"), method_match); - defineDefaultProperty(ctx, QStringLiteral("replace"), method_replace); - defineDefaultProperty(ctx, QStringLiteral("search"), method_search); - defineDefaultProperty(ctx, QStringLiteral("slice"), method_slice); - defineDefaultProperty(ctx, QStringLiteral("split"), method_split); - defineDefaultProperty(ctx, QStringLiteral("substr"), method_substr); - defineDefaultProperty(ctx, QStringLiteral("substring"), method_substring); + defineDefaultProperty(ctx, QStringLiteral("charAt"), method_charAt, 1); + defineDefaultProperty(ctx, QStringLiteral("charCodeAt"), method_charCodeAt, 1); + defineDefaultProperty(ctx, QStringLiteral("concat"), method_concat, 1); + defineDefaultProperty(ctx, QStringLiteral("indexOf"), method_indexOf, 1); + defineDefaultProperty(ctx, QStringLiteral("lastIndexOf"), method_lastIndexOf, 1); + defineDefaultProperty(ctx, QStringLiteral("localeCompare"), method_localeCompare, 1); + defineDefaultProperty(ctx, QStringLiteral("match"), method_match, 1); + defineDefaultProperty(ctx, QStringLiteral("replace"), method_replace, 2); + defineDefaultProperty(ctx, QStringLiteral("search"), method_search, 1); + defineDefaultProperty(ctx, QStringLiteral("slice"), method_slice, 2); + defineDefaultProperty(ctx, QStringLiteral("split"), method_split, 2); + defineDefaultProperty(ctx, QStringLiteral("substr"), method_substr, 2); + defineDefaultProperty(ctx, QStringLiteral("substring"), method_substring, 2); defineDefaultProperty(ctx, QStringLiteral("toLowerCase"), method_toLowerCase); defineDefaultProperty(ctx, QStringLiteral("toLocaleLowerCase"), method_toLocaleLowerCase); defineDefaultProperty(ctx, QStringLiteral("toUpperCase"), method_toUpperCase); @@ -1345,7 +1345,7 @@ void NumberPrototype::init(ExecutionContext *ctx, const Value &ctor) defineDefaultProperty(ctx, QStringLiteral("toString"), method_toString); defineDefaultProperty(ctx, QStringLiteral("toLocalString"), method_toLocaleString); defineDefaultProperty(ctx, QStringLiteral("valueOf"), method_valueOf); - defineDefaultProperty(ctx, QStringLiteral("toFixed"), method_toFixed); + defineDefaultProperty(ctx, QStringLiteral("toFixed"), method_toFixed, 1); defineDefaultProperty(ctx, QStringLiteral("toExponential"), method_toExponential); defineDefaultProperty(ctx, QStringLiteral("toPrecision"), method_toPrecision); } @@ -1575,15 +1575,15 @@ void ArrayPrototype::init(ExecutionContext *ctx, const Value &ctor) defineDefaultProperty(ctx, QStringLiteral("sort"), method_sort, 1); defineDefaultProperty(ctx, QStringLiteral("splice"), method_splice, 2); defineDefaultProperty(ctx, QStringLiteral("unshift"), method_unshift, 1); - defineDefaultProperty(ctx, QStringLiteral("indexOf"), method_indexOf, 0); - defineDefaultProperty(ctx, QStringLiteral("lastIndexOf"), method_lastIndexOf, 0); - defineDefaultProperty(ctx, QStringLiteral("every"), method_every, 0); - defineDefaultProperty(ctx, QStringLiteral("some"), method_some, 0); - defineDefaultProperty(ctx, QStringLiteral("forEach"), method_forEach, 0); - defineDefaultProperty(ctx, QStringLiteral("map"), method_map, 0); - defineDefaultProperty(ctx, QStringLiteral("filter"), method_filter, 0); - defineDefaultProperty(ctx, QStringLiteral("reduce"), method_reduce, 0); - defineDefaultProperty(ctx, QStringLiteral("reduceRight"), method_reduceRight, 0); + defineDefaultProperty(ctx, QStringLiteral("indexOf"), method_indexOf, 1); + defineDefaultProperty(ctx, QStringLiteral("lastIndexOf"), method_lastIndexOf, 1); + defineDefaultProperty(ctx, QStringLiteral("every"), method_every, 1); + defineDefaultProperty(ctx, QStringLiteral("some"), method_some, 1); + defineDefaultProperty(ctx, QStringLiteral("forEach"), method_forEach, 1); + defineDefaultProperty(ctx, QStringLiteral("map"), method_map, 1); + defineDefaultProperty(ctx, QStringLiteral("filter"), method_filter, 1); + defineDefaultProperty(ctx, QStringLiteral("reduce"), method_reduce, 1); + defineDefaultProperty(ctx, QStringLiteral("reduceRight"), method_reduceRight, 1); } Value ArrayPrototype::method_toString(ExecutionContext *ctx) @@ -2104,8 +2104,8 @@ void FunctionPrototype::init(ExecutionContext *ctx, const Value &ctor) defineDefaultProperty(ctx, QStringLiteral("constructor"), ctor); defineDefaultProperty(ctx, QStringLiteral("toString"), method_toString, 0); defineDefaultProperty(ctx, QStringLiteral("apply"), method_apply, 0); - defineDefaultProperty(ctx, QStringLiteral("call"), method_call, 0); - defineDefaultProperty(ctx, QStringLiteral("bind"), method_bind, 0); + defineDefaultProperty(ctx, QStringLiteral("call"), method_call, 1); + defineDefaultProperty(ctx, QStringLiteral("bind"), method_bind, 1); } Value FunctionPrototype::method_toString(ExecutionContext *ctx) @@ -2822,8 +2822,8 @@ void RegExpPrototype::init(ExecutionContext *ctx, const Value &ctor) { ctor.objectValue()->defineDefaultProperty(ctx->engine->id_prototype, Value::fromObject(this)); defineDefaultProperty(ctx, QStringLiteral("constructor"), ctor); - defineDefaultProperty(ctx, QStringLiteral("exec"), method_exec, 0); - defineDefaultProperty(ctx, QStringLiteral("test"), method_test, 0); + defineDefaultProperty(ctx, QStringLiteral("exec"), method_exec, 1); + defineDefaultProperty(ctx, QStringLiteral("test"), method_test, 1); defineDefaultProperty(ctx, QStringLiteral("toString"), method_toString, 0); } diff --git a/tests/TestExpectations b/tests/TestExpectations index cd4e7ed6e5..9690768efb 100644 --- a/tests/TestExpectations +++ b/tests/TestExpectations @@ -613,8 +613,6 @@ S15.10.4.1_A9_T3 failing S15.10.5.1_A3 failing S15.10.5.1_A4 failing S15.10.5_A1 failing -S15.10.6.2_A10 failing -S15.10.6.2_A11 failing S15.10.6.2_A1_T2 failing S15.10.6.2_A1_T6 failing S15.10.6.2_A4_T1 failing @@ -632,16 +630,6 @@ S15.10.6.2_A4_T9 failing S15.10.6.2_A5_T1 failing S15.10.6.2_A5_T2 failing S15.10.6.2_A5_T3 failing -S15.10.6.2_A8 failing -S15.10.6.2_A9 failing -S15.10.6.3_A10 failing -S15.10.6.3_A11 failing -S15.10.6.3_A8 failing -S15.10.6.3_A9 failing -S15.10.6.4_A10 failing -S15.10.6.4_A11 failing -S15.10.6.4_A8 failing -S15.10.6.4_A9 failing S15.10.7_A2_T1 failing 15.10.7.1-2 failing S15.10.7.1_A10 failing @@ -761,11 +749,8 @@ S15.2.3_A3 failing S15.2.3.1_A1 failing S15.2.3.1_A2 failing S15.2.3.1_A3 failing -15.2.3.10-0-2 failing 15.2.3.10-3-12 failing -15.2.3.11-0-2 failing 15.2.3.11-4-27 failing -15.2.3.12-0-2 failing 15.12.3-11-2 failing 15.12.3-11-26 failing 15.12.3-11-3 failing @@ -859,9 +844,7 @@ S15.10.1_A1_T1 failing S15.10.1_A1_T10 failing S15.10.1_A1_T11 failing 15.2.3.12-3-27 failing -15.2.3.13-0-2 failing 15.2.3.13-2-12 failing -15.2.3.14-0-2 failing 15.2.3.14-2-1 failing 15.2.3.14-3-2 failing 15.2.3.14-3-3 failing @@ -876,7 +859,6 @@ S15.10.1_A1_T11 failing 15.2.3.14-5-a-2 failing 15.2.3.14-5-a-3 failing 15.2.3.14-5-a-4 failing -15.2.3.2-0-2 failing 15.2.3.2-2-12 failing 15.2.3.2-2-13 failing 15.2.3.2-2-14 failing @@ -886,7 +868,6 @@ S15.10.1_A1_T11 failing 15.2.3.2-2-18 failing 15.2.3.2-2-3 failing 15.2.3.2-2-31 failing -15.2.3.3-0-2 failing S15.1.3.1_A2.2_T1 failing S15.1.3.1_A2.3_T1 failing S15.1.3.1_A2.4_T1 failing @@ -989,7 +970,6 @@ S15.1.3.2_A5.3 failing 15.2.3.3-4-82 failing 15.2.3.3-4-9 failing 15.2.3.3-4-90 failing -15.2.3.4-0-2 failing 15.2.3.4-2-1 failing 15.2.3.4-3-1 failing 15.2.3.4-4-2 failing @@ -1003,7 +983,6 @@ S15.1.3.2_A5.3 failing 15.2.3.4-4-b-3 failing 15.2.3.4-4-b-5 failing 15.2.3.4-4-b-6 failing -15.2.3.5-0-2 failing 15.2.3.5-1-2 failing 15.2.3.5-4-120 failing 15.2.3.5-4-13 failing @@ -1015,7 +994,6 @@ S15.1.3.2_A5.3 failing 15.2.3.5-4-252 failing 15.2.3.5-4-67 failing 15.2.3.5-4-92 failing -15.2.3.6-0-2 failing 15.2.3.6-2-17-1 failing 15.2.3.5-4-287 failing 15.2.3.5-4-315 failing @@ -1251,7 +1229,6 @@ S15.1.3.2_A5.3 failing 15.2.3.6-4-82-7 failing 15.2.3.6-4-82-8 failing 15.2.3.6-4-82-9 failing -15.2.3.7-0-2 failing 15.2.3.7-2-14 failing 15.2.3.7-2-15 failing 15.2.3.7-5-a-15 failing @@ -1473,40 +1450,14 @@ S15.1.3.2_A5.3 failing 15.2.3.7-6-a-97 failing 15.2.3.7-6-a-98 failing 15.2.3.7-6-a-99 failing -15.2.3.8-0-2 failing -15.2.3.9-0-2 failing 15.2.3.9-2-a-12 failing 15.2.3.9-2-a-14 failing 15.2.4.2-1-1 failing 15.2.4.2-1-2 failing 15.2.4.2-2-1 failing 15.2.4.2-2-2 failing -S15.2.4.2_A10 failing -S15.2.4.2_A11 failing S15.2.4.2_A12 failing S15.2.4.2_A13 failing -S15.2.4.2_A8 failing -S15.2.4.2_A9 failing -S15.2.4.3_A10 failing -S15.2.4.3_A11 failing -S15.2.4.3_A8 failing -S15.2.4.3_A9 failing -S15.2.4.4_A10 failing -S15.2.4.4_A11 failing -S15.2.4.4_A8 failing -S15.2.4.4_A9 failing -S15.2.4.5_A10 failing -S15.2.4.5_A11 failing -S15.2.4.5_A8 failing -S15.2.4.5_A9 failing -S15.2.4.6_A10 failing -S15.2.4.6_A11 failing -S15.2.4.6_A8 failing -S15.2.4.6_A9 failing -S15.2.4.7_A10 failing -S15.2.4.7_A11 failing -S15.2.4.7_A8 failing -S15.2.4.7_A9 failing S15.3_A2_T1 failing S15.3_A2_T2 failing S15.3.2.1_A1_T13 failing @@ -1530,15 +1481,9 @@ S15.3.3_A3 failing S15.3.3.1_A1 failing S15.3.3.1_A3 failing 15.3.3.2-1 failing -S15.3.4.2_A10 failing -S15.3.4.2_A11 failing -S15.3.4.2_A8 failing -S15.3.4.2_A9 failing 15.3.4.3-1-s failing 15.3.4.3-2-s failing 15.3.4.3-3-s failing -S15.3.4.3_A10 failing -S15.3.4.3_A11 failing S15.3.4.3_A2_T1 failing S15.3.4.3_A2_T2 failing S15.3.4.3_A3_T1 failing @@ -1564,14 +1509,9 @@ S15.3.4.3_A7_T7 failing S15.3.4.3_A7_T8 failing S15.3.4.3_A7_T9 failing S15.3.4.3_A8_T6 failing -S15.3.4.3_A9 failing 15.3.4.4-1-s failing 15.3.4.4-2-s failing 15.3.4.4-3-s failing -S15.3.4.4_A10 failing -S15.3.4.4_A11 failing -S15.3.4.4_A2_T1 failing -S15.3.4.4_A2_T2 failing S15.3.4.4_A6_T1 failing S15.3.4.4_A6_T10 failing S15.3.4.4_A6_T2 failing @@ -1582,8 +1522,6 @@ S15.3.4.4_A6_T6 failing S15.3.4.4_A6_T7 failing S15.3.4.4_A6_T8 failing S15.3.4.4_A6_T9 failing -S15.3.4.4_A9 failing -15.3.4.5-0-2 failing 15.3.4.5-10-1 failing 15.3.4.5-11-1 failing 15.3.4.5-13.b-1 failing @@ -1759,9 +1697,6 @@ S15.4.4.10_A2.2_T5 failing S15.4.4.10_A3_T3 failing S15.4.4.10_A4_T1 failing S15.4.4.10_A5.1 failing -S15.4.4.10_A5.2 failing -S15.4.4.10_A5.3 failing -S15.4.4.10_A5.4 failing S15.4.4.10_A5.7 failing S15.4.4.11_A3_T1 failing S15.4.4.11_A3_T2 failing @@ -1770,9 +1705,6 @@ S15.4.4.11_A4_T2 failing S15.4.4.11_A4_T3 failing S15.4.4.11_A6_T2 failing S15.4.4.11_A7.1 failing -S15.4.4.11_A7.2 failing -S15.4.4.11_A7.3 failing -S15.4.4.11_A7.4 failing S15.4.4.11_A7.7 failing 15.4.4.12-9-c-ii-1 failing S15.4.4.12_A1.1_T4 failing @@ -1792,9 +1724,6 @@ S15.4.4.12_A4_T1 failing S15.4.4.12_A4_T2 failing S15.4.4.12_A4_T3 failing S15.4.4.12_A5.1 failing -S15.4.4.12_A5.2 failing -S15.4.4.12_A5.3 failing -S15.4.4.12_A5.4 failing S15.4.4.12_A5.7 failing S15.4.4.13_A2_T1 failing S15.4.4.13_A2_T2 failing @@ -1805,11 +1734,7 @@ S15.4.4.13_A3_T3 failing S15.4.4.13_A4_T1 failing S15.4.4.13_A4_T2 failing S15.4.4.13_A5.1 failing -S15.4.4.13_A5.2 failing -S15.4.4.13_A5.3 failing -S15.4.4.13_A5.4 failing S15.4.4.13_A5.7 failing -15.4.4.14-0-2 failing 15.4.4.14-1-1 failing 15.4.4.14-1-10 failing 15.4.4.14-1-11 failing @@ -1938,7 +1863,6 @@ S15.4.4.13_A5.7 failing 15.4.4.14-9-b-i-9 failing 15.4.4.14-9-b-ii-2 failing 15.4.4.14-9-b-ii-5 failing -15.4.4.15-0-2 failing 15.4.4.15-1-1 failing 15.4.4.15-1-10 failing 15.4.4.15-1-11 failing @@ -2127,7 +2051,6 @@ S15.4.4.13_A5.7 failing 15.4.4.15-8-b-iii-2 failing 15.4.4.15-9-1 failing 15.4.4.15-9-2 failing -15.4.4.16-0-2 failing 15.4.4.16-1-1 failing 15.4.4.16-1-10 failing 15.4.4.16-1-11 failing @@ -2269,7 +2192,6 @@ S15.4.4.13_A5.7 failing 15.4.4.16-8-6 failing 15.4.4.16-8-7 failing 15.4.4.16-8-8 failing -15.4.4.17-0-2 failing 15.4.4.17-1-1 failing 15.4.4.17-1-10 failing 15.4.4.17-1-11 failing @@ -2410,7 +2332,6 @@ S15.4.4.13_A5.7 failing 15.4.4.17-8-6 failing 15.4.4.17-8-7 failing 15.4.4.17-8-8 failing -15.4.4.18-0-2 failing 15.4.4.18-1-1 failing 15.4.4.18-1-10 failing 15.4.4.18-1-11 failing @@ -2547,7 +2468,6 @@ S15.4.4.13_A5.7 failing 15.4.4.18-8-7 failing 15.4.4.18-8-8 failing 15.4.4.18-8-9 failing -15.4.4.19-0-2 failing 15.4.4.19-1-1 failing 15.4.4.19-1-10 failing 15.4.4.19-1-11 failing @@ -2690,11 +2610,7 @@ S15.4.4.13_A5.7 failing 15.4.4.19-9-9 failing S15.4.4.2_A1_T1 failing S15.4.4.2_A3_T1 failing -S15.4.4.2_A4.2 failing -S15.4.4.2_A4.3 failing -S15.4.4.2_A4.4 failing S15.4.4.2_A4.7 failing -15.4.4.20-0-2 failing 15.4.4.20-1-1 failing 15.4.4.20-1-10 failing 15.4.4.20-1-11 failing @@ -2843,7 +2759,6 @@ S15.4.4.2_A4.7 failing 15.4.4.20-9-c-iii-3 failing 15.4.4.20-9-c-iii-4 failing 15.4.4.20-9-c-iii-5 failing -15.4.4.21-0-2 failing 15.4.4.21-1-1 failing 15.4.4.21-1-10 failing 15.4.4.21-1-11 failing @@ -3115,7 +3030,6 @@ S15.4.4.2_A4.7 failing 15.4.4.21-9-c-ii-5 failing 15.4.4.21-9-c-ii-8 failing 15.4.4.21-9-c-ii-9 failing -15.4.4.22-0-2 failing 15.4.4.22-1-1 failing 15.4.4.22-1-10 failing 15.4.4.22-1-11 failing @@ -3271,9 +3185,6 @@ S15.4.4.2_A4.7 failing 15.4.4.22-9-c-ii-8 failing S15.4.4.3_A1_T1 failing S15.4.4.3_A3_T1 failing -S15.4.4.3_A4.2 failing -S15.4.4.3_A4.3 failing -S15.4.4.3_A4.4 failing S15.4.4.3_A4.7 failing 15.4.4.4-5-b-iii-3-b-1 failing 15.4.4.4-5-c-i-1 failing @@ -3282,16 +3193,10 @@ S15.4.4.4_A2_T1 failing S15.4.4.4_A2_T2 failing S15.4.4.4_A3_T1 failing S15.4.4.4_A4.1 failing -S15.4.4.4_A4.2 failing -S15.4.4.4_A4.3 failing -S15.4.4.4_A4.4 failing S15.4.4.4_A4.7 failing S15.4.4.5_A1.1_T1 failing S15.4.4.5_A5_T1 failing S15.4.4.5_A6.1 failing -S15.4.4.5_A6.2 failing -S15.4.4.5_A6.3 failing -S15.4.4.5_A6.4 failing S15.4.4.5_A6.7 failing S15.4.4.6_A1.1_T1 failing S15.4.4.6_A1.2_T1 failing @@ -3300,25 +3205,15 @@ S15.4.4.6_A3_T3 failing S15.4.4.6_A4_T1 failing S15.4.4.6_A4_T2 failing S15.4.4.6_A5.1 failing -S15.4.4.6_A5.2 failing -S15.4.4.6_A5.3 failing -S15.4.4.6_A5.4 failing S15.4.4.6_A5.7 failing S15.4.4.7_A3 failing S15.4.4.7_A4_T2 failing S15.4.4.7_A4_T3 failing S15.4.4.7_A6.1 failing -S15.4.4.7_A6.2 failing -S15.4.4.7_A6.3 failing -S15.4.4.7_A6.4 failing S15.5.3.1_A3 failing S15.5.3.1_A4 failing -S15.5.3.2_A1 failing S15.5.3.2_A4 failing S15.5.3_A1 failing -S15.5.4.2_A4_T1 failing -S15.5.4.10_A10 failing -S15.5.4.10_A11 failing S15.5.4.10_A1_T1 failing S15.5.4.10_A1_T10 failing S15.5.4.10_A1_T11 failing @@ -3351,11 +3246,7 @@ S15.5.4.10_A2_T6 failing S15.5.4.10_A2_T7 failing S15.5.4.10_A2_T8 failing S15.5.4.10_A2_T9 failing -S15.5.4.10_A8 failing -S15.5.4.10_A9 failing 15.5.4.11-1 failing -S15.5.4.11_A10 failing -S15.5.4.11_A11 failing S15.5.4.11_A12 failing S15.5.4.11_A1_T1 failing S15.5.4.11_A1_T10 failing @@ -3391,11 +3282,7 @@ S15.5.4.11_A4_T2 failing S15.5.4.11_A4_T3 failing S15.5.4.11_A4_T4 failing S15.5.4.11_A5_T1 failing -S15.5.4.11_A8 failing -S15.5.4.11_A9 failing S15.5.4.12_A1.1_T1 failing -S15.5.4.12_A10 failing -S15.5.4.12_A11 failing S15.5.4.12_A1_T1 failing S15.5.4.12_A1_T10 failing S15.5.4.12_A1_T11 failing @@ -3419,10 +3306,6 @@ S15.5.4.12_A2_T7 failing S15.5.4.12_A3_T1 failing S15.5.4.12_A3_T2 failing S15.5.4.12_A7 failing -S15.5.4.12_A8 failing -S15.5.4.12_A9 failing -S15.5.4.13_A10 failing -S15.5.4.13_A11 failing S15.5.4.13_A1_T1 failing S15.5.4.13_A1_T10 failing S15.5.4.13_A1_T11 failing @@ -3442,9 +3325,6 @@ S15.4.4.8_A3_T3 failing S15.4.4.8_A4_T1 failing S15.4.4.8_A4_T2 failing S15.4.4.8_A5.1 failing -S15.4.4.8_A5.2 failing -S15.4.4.8_A5.3 failing -S15.4.4.8_A5.4 failing S15.4.4.8_A5.7 failing S15.4.4.9_A1.1_T1 failing S15.4.4.9_A1.2_T1 failing @@ -3459,9 +3339,6 @@ S15.4.4.9_A3_T3 failing S15.4.4.9_A4_T1 failing S15.4.4.9_A4_T2 failing S15.4.4.9_A5.1 failing -S15.4.4.9_A5.2 failing -S15.4.4.9_A5.3 failing -S15.4.4.9_A5.4 failing S15.4.4.9_A5.7 failing 15.4.5.1-3.d-1 failing 15.4.5.1-3.d-2 failing @@ -3484,10 +3361,6 @@ S15.5.4.13_A3_T1 failing S15.5.4.13_A3_T2 failing S15.5.4.13_A3_T3 failing S15.5.4.13_A3_T4 failing -S15.5.4.13_A8 failing -S15.5.4.13_A9 failing -S15.5.4.14_A10 failing -S15.5.4.14_A11 failing S15.5.4.14_A1_T1 failing S15.5.4.14_A1_T10 failing S15.5.4.14_A1_T11 failing @@ -3585,10 +3458,6 @@ S15.5.4.14_A4_T6 failing S15.5.4.14_A4_T7 failing S15.5.4.14_A4_T8 failing S15.5.4.14_A4_T9 failing -S15.5.4.14_A8 failing -S15.5.4.14_A9 failing -S15.5.4.15_A10 failing -S15.5.4.15_A11 failing S15.5.4.15_A1_T1 failing S15.5.4.15_A1_T10 failing S15.5.4.15_A1_T11 failing @@ -3611,10 +3480,6 @@ S15.5.4.15_A3_T6 failing S15.5.4.15_A3_T7 failing S15.5.4.15_A3_T8 failing S15.5.4.15_A3_T9 failing -S15.5.4.15_A8 failing -S15.5.4.15_A9 failing -S15.5.4.16_A10 failing -S15.5.4.16_A11 failing S15.5.4.16_A1_T1 failing S15.5.4.16_A1_T10 failing S15.5.4.16_A1_T11 failing @@ -3625,10 +3490,6 @@ S15.5.4.16_A1_T2 failing S15.5.4.16_A1_T6 failing S15.5.4.16_A1_T7 failing S15.5.4.16_A1_T8 failing -S15.5.4.16_A8 failing -S15.5.4.16_A9 failing -S15.5.4.17_A10 failing -S15.5.4.17_A11 failing S15.5.4.17_A1_T1 failing S15.5.4.17_A1_T10 failing S15.5.4.17_A1_T11 failing @@ -3639,10 +3500,6 @@ S15.5.4.17_A1_T2 failing S15.5.4.17_A1_T6 failing S15.5.4.17_A1_T7 failing S15.5.4.17_A1_T8 failing -S15.5.4.17_A8 failing -S15.5.4.17_A9 failing -S15.5.4.18_A10 failing -S15.5.4.18_A11 failing S15.5.4.18_A1_T1 failing S15.5.4.18_A1_T10 failing S15.5.4.18_A1_T11 failing @@ -3653,10 +3510,6 @@ S15.5.4.18_A1_T2 failing S15.5.4.18_A1_T6 failing S15.5.4.18_A1_T7 failing S15.5.4.18_A1_T8 failing -S15.5.4.18_A8 failing -S15.5.4.18_A9 failing -S15.5.4.19_A10 failing -S15.5.4.19_A11 failing S15.5.4.19_A1_T1 failing S15.5.4.19_A1_T10 failing S15.5.4.19_A1_T11 failing @@ -3667,8 +3520,6 @@ S15.5.4.19_A1_T2 failing S15.5.4.19_A1_T6 failing S15.5.4.19_A1_T7 failing S15.5.4.19_A1_T8 failing -S15.5.4.19_A8 failing -S15.5.4.19_A9 failing 15.5.4.20-0-1 failing 15.5.4.20-0-2 failing 15.5.4.20-1-3 failing @@ -3744,30 +3595,18 @@ S15.5.4.19_A9 failing 15.5.4.20-3-9 failing 15.5.4.20-4-1 failing S15.5.4.4_A5 failing -S15.5.4.4_A8 failing -S15.5.4.4_A9 failing S15.5.4.5_A1.1 failing -S15.5.4.5_A10 failing -S15.5.4.5_A11 failing S15.5.4.5_A1_T1 failing S15.5.4.5_A1_T10 failing S15.5.4.5_A1_T2 failing S15.5.4.5_A2 failing S15.5.4.5_A4 failing -S15.5.4.5_A8 failing -S15.5.4.5_A9 failing -S15.5.4.6_A10 failing -S15.5.4.6_A11 failing S15.5.4.6_A1_T1 failing S15.5.4.6_A1_T10 failing S15.5.4.6_A1_T2 failing S15.5.4.6_A2 failing S15.5.4.6_A4_T1 failing S15.5.4.6_A4_T2 failing -S15.5.4.6_A8 failing -S15.5.4.6_A9 failing -S15.5.4.7_A10 failing -S15.5.4.7_A11 failing S15.5.4.7_A1_T1 failing S15.5.4.7_A1_T10 failing S15.5.4.7_A1_T11 failing @@ -3823,8 +3662,6 @@ S15.5.4.7_A1_T2 failing 15.5.4.20-4-60 failing 15.5.4.20-4-8 failing S15.5.4.4_A1.1 failing -S15.5.4.4_A10 failing -S15.5.4.4_A11 failing S15.5.4.4_A1_T1 failing S15.5.4.4_A1_T10 failing S15.5.4.4_A1_T2 failing @@ -3833,10 +3670,6 @@ S15.5.4.7_A4_T1 failing S15.5.4.7_A4_T2 failing S15.5.4.7_A4_T4 failing S15.5.4.7_A4_T5 failing -S15.5.4.7_A8 failing -S15.5.4.7_A9 failing -S15.5.4.8_A10 failing -S15.5.4.8_A11 failing S15.5.4.8_A1_T1 failing S15.5.4.8_A1_T10 failing S15.5.4.8_A1_T12 failing @@ -3846,12 +3679,6 @@ S15.5.4.8_A4_T1 failing S15.5.4.8_A4_T2 failing S15.5.4.8_A4_T4 failing S15.5.4.8_A4_T5 failing -S15.5.4.8_A8 failing -S15.5.4.8_A9 failing -S15.5.4.9_A10 failing -S15.5.4.9_A11 failing -S15.5.4.9_A8 failing -S15.5.4.9_A9 failing S15.5.5.1_A1 failing S15.5.5.1_A2 failing S15.5.5.1_A3 failing @@ -3871,20 +3698,11 @@ S15.7.4_A3.3 failing S15.7.4.5_A1.3_T01 failing S15.7.4.5_A1.3_T02 failing S15.7.4.5_A1.4_T01 failing -S15.7.4.5_A2_T01 failing -S15.8.2.11_A4 failing -S15.8.2.12_A4 failing S15.8.2.16_A4 failing S15.8.2.16_A5 failing S15.8.2.17_A2 failing S15.9.4.1_A1_T1 failing S15.9.4.1_A1_T2 failing -S15.9.4.2_A2_T1 failing -S15.9.4.2_A3_T1 failing -S15.9.4.2_A3_T2 failing -S15.9.4.3_A2_T1 failing -S15.9.4.3_A3_T1 failing -S15.9.4.3_A3_T2 failing 15.9.4.4-0-1 failing 15.9.4.4-0-2 failing 15.9.4.4-0-3 failing @@ -3905,114 +3723,7 @@ S15.8.2.7_A5 failing S15.9.5.1_A2_T1 failing S15.9.5.1_A3_T1 failing S15.9.5.1_A3_T2 failing -S15.9.5.10_A2_T1 failing -S15.9.5.10_A3_T1 failing -S15.9.5.10_A3_T2 failing -S15.9.5.11_A2_T1 failing -S15.9.5.11_A3_T1 failing -S15.9.5.11_A3_T2 failing -S15.9.5.12_A2_T1 failing -S15.9.5.12_A3_T1 failing -S15.9.5.12_A3_T2 failing -S15.9.5.13_A2_T1 failing -S15.9.5.13_A3_T1 failing -S15.9.5.13_A3_T2 failing -S15.9.5.14_A2_T1 failing -S15.9.5.14_A3_T1 failing -S15.9.5.14_A3_T2 failing -S15.9.5.15_A2_T1 failing -S15.9.5.15_A3_T1 failing -S15.9.5.15_A3_T2 failing -S15.9.5.16_A2_T1 failing -S15.9.5.16_A3_T1 failing -S15.9.5.16_A3_T2 failing -S15.9.5.17_A2_T1 failing -S15.9.5.17_A3_T1 failing -S15.9.5.17_A3_T2 failing -13.3.3_L15 failing -S15.9.5.18_A2_T1 failing -S15.9.5.18_A3_T1 failing -S15.9.5.18_A3_T2 failing -S15.9.5.19_A2_T1 failing -S15.9.5.19_A3_T1 failing -S15.9.5.19_A3_T2 failing -S15.9.5.2_A2_T1 failing -S15.9.5.2_A3_T1 failing -S15.9.5.2_A3_T2 failing -S15.9.5.20_A2_T1 failing -S15.9.5.20_A3_T1 failing -S15.9.5.20_A3_T2 failing -S15.9.5.21_A2_T1 failing -S15.9.5.21_A3_T1 failing -S15.9.5.21_A3_T2 failing -S15.9.5.22_A2_T1 failing -S15.9.5.22_A3_T1 failing -S15.9.5.22_A3_T2 failing -S15.9.5.23_A2_T1 failing -S15.9.5.23_A3_T1 failing -S15.9.5.23_A3_T2 failing -S15.9.5.24_A2_T1 failing -S15.9.5.24_A3_T1 failing -S15.9.5.24_A3_T2 failing -S15.9.5.25_A2_T1 failing -S15.9.5.25_A3_T1 failing -S15.9.5.25_A3_T2 failing -S15.9.5.26_A2_T1 failing -S15.9.5.26_A3_T1 failing -S15.9.5.26_A3_T2 failing -S15.9.5.27_A2_T1 failing -S15.9.5.27_A3_T1 failing -S15.9.5.27_A3_T2 failing -S15.9.5.28_A2_T1 failing -S15.9.5.28_A3_T1 failing -S15.9.5.28_A3_T2 failing -S15.9.5.29_A2_T1 failing -S15.9.5.29_A3_T1 failing -S15.9.5.29_A3_T2 failing -S15.9.5.3_A2_T1 failing -S15.9.5.3_A3_T1 failing -S15.9.5.3_A3_T2 failing -S15.9.5.30_A2_T1 failing -S15.9.5.30_A3_T1 failing -S15.9.5.30_A3_T2 failing -S15.9.5.31_A2_T1 failing -S15.9.5.31_A3_T1 failing -S15.9.5.31_A3_T2 failing -S15.9.5.32_A2_T1 failing -S15.9.5.32_A3_T1 failing -S15.9.5.32_A3_T2 failing -S15.9.5.33_A2_T1 failing -S15.9.5.33_A3_T1 failing -S15.9.5.33_A3_T2 failing -S15.9.5.34_A2_T1 failing -S15.9.5.34_A3_T1 failing -S15.9.5.34_A3_T2 failing -S15.9.5.35_A2_T1 failing -S15.9.5.35_A3_T1 failing -S15.9.5.35_A3_T2 failing -S15.9.5.36_A2_T1 failing -S15.9.5.36_A3_T1 failing -S15.9.5.36_A3_T2 failing -S15.9.5.37_A2_T1 failing -S15.9.5.37_A3_T1 failing -S15.9.5.37_A3_T2 failing -S15.9.5.38_A2_T1 failing -S15.9.5.38_A3_T1 failing -S15.9.5.38_A3_T2 failing -S15.9.5.39_A2_T1 failing -S15.9.5.39_A3_T1 failing -S15.9.5.39_A3_T2 failing -S15.9.5.4_A2_T1 failing -S15.9.5.4_A3_T1 failing -S15.9.5.4_A3_T2 failing 15.9.5.40_1 failing -S15.9.5.40_A2_T1 failing -S15.9.5.40_A3_T1 failing -S15.9.5.40_A3_T2 failing -S15.9.5.41_A2_T1 failing -S15.9.5.41_A3_T1 failing -S15.9.5.41_A3_T2 failing -S15.9.5.42_A2_T1 failing 6.4_c failing 8.0_L15 failing 9.1_a failing @@ -4127,7 +3838,6 @@ S15.9.5.42_A2_T1 failing 13.1.1_2 failing 13.1.1_6 failing 13.1.1_7 failing -13.1.1_L15 failing 13.2.1_1 failing 13.2.1_4 failing 13.2.1_5 failing @@ -4135,10 +3845,6 @@ S15.9.5.42_A2_T1 failing 13.3.0_2 failing 13.3.0_6 failing 13.3.0_7 failing -13.3.1_L15 failing -13.3.2_L15 failing -S15.9.5.42_A3_T1 failing -S15.9.5.42_A3_T2 failing 15.9.5.43-0-10 failing 15.9.5.43-0-11 failing 15.9.5.43-0-12 failing @@ -4153,21 +3859,6 @@ S15.9.5.42_A3_T2 failing 15.9.5.43-0-9 failing 15.9.5.44-0-1 failing 15.9.5.44-0-2 failing -S15.9.5.5_A2_T1 failing -S15.9.5.5_A3_T1 failing -S15.9.5.5_A3_T2 failing -S15.9.5.6_A2_T1 failing -S15.9.5.6_A3_T1 failing -S15.9.5.6_A3_T2 failing -S15.9.5.7_A2_T1 failing -S15.9.5.7_A3_T1 failing -S15.9.5.7_A3_T2 failing -S15.9.5.8_A2_T1 failing -S15.9.5.8_A3_T1 failing -S15.9.5.8_A3_T2 failing -S15.9.5.9_A2_T1 failing -S15.9.5.9_A3_T1 failing -S15.9.5.9_A3_T2 failing 6.2.2_a failing 6.2.2_b failing 6.2.2_c failing @@ -4284,4 +3975,4 @@ S15.4.4.4_A1_T2 failing S15.4.4.4_A1_T3 failing # Regression introduced by qtdeclarative parser changes -S7.9_A5.7_T1 failing +S7.9_A5.7_T1 failing \ No newline at end of file