From be0f4c04497f70f77511943716d7c592bc11de0d Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Wed, 4 Nov 2009 11:10:22 +1000 Subject: Improve qmllanguage test case --- src/declarative/qml/qmlcompiler.cpp | 33 +++++++++++++--------- .../qmllanguage/data/NestedErrorsType.qml | 5 ++++ .../qmllanguage/data/assignBasicTypes.qml | 2 ++ .../qmllanguage/data/component.1.errors.txt | 1 + .../declarative/qmllanguage/data/component.1.qml | 4 +++ .../qmllanguage/data/component.2.errors.txt | 1 + .../declarative/qmllanguage/data/component.2.qml | 9 ++++++ .../qmllanguage/data/component.3.errors.txt | 1 + .../declarative/qmllanguage/data/component.3.qml | 9 ++++++ .../qmllanguage/data/component.4.errors.txt | 1 + .../declarative/qmllanguage/data/component.4.qml | 6 ++++ .../qmllanguage/data/component.5.errors.txt | 1 + .../declarative/qmllanguage/data/component.5.qml | 6 ++++ .../qmllanguage/data/component.6.errors.txt | 1 + .../declarative/qmllanguage/data/component.6.qml | 6 ++++ .../qmllanguage/data/defaultGrouped.errors.txt | 1 + .../qmllanguage/data/defaultGrouped.qml | 10 +++++++ .../qmllanguage/data/doubleSignal.errors.txt | 1 + .../declarative/qmllanguage/data/doubleSignal.qml | 7 +++++ .../qmllanguage/data/emptySignal.errors.txt | 1 + .../declarative/qmllanguage/data/emptySignal.qml | 6 ++++ .../qmllanguage/data/nestedErrors.errors.txt | 2 ++ .../declarative/qmllanguage/data/nestedErrors.qml | 6 ++++ .../qmllanguage/data/script.1.errors.txt | 1 + .../auto/declarative/qmllanguage/data/script.1.qml | 4 +++ .../qmllanguage/data/script.10.errors.txt | 1 + .../declarative/qmllanguage/data/script.10.qml | 9 ++++++ .../qmllanguage/data/script.11.errors.txt | 1 + .../declarative/qmllanguage/data/script.11.qml | 7 +++++ .../qmllanguage/data/script.2.errors.txt | 1 + .../auto/declarative/qmllanguage/data/script.2.qml | 7 +++++ .../qmllanguage/data/script.3.errors.txt | 1 + .../auto/declarative/qmllanguage/data/script.3.qml | 7 +++++ .../qmllanguage/data/script.4.errors.txt | 1 + .../auto/declarative/qmllanguage/data/script.4.qml | 8 ++++++ .../qmllanguage/data/script.5.errors.txt | 1 + .../auto/declarative/qmllanguage/data/script.5.qml | 9 ++++++ .../qmllanguage/data/script.6.errors.txt | 1 + .../auto/declarative/qmllanguage/data/script.6.qml | 11 ++++++++ .../qmllanguage/data/script.7.errors.txt | 1 + .../auto/declarative/qmllanguage/data/script.7.qml | 11 ++++++++ .../qmllanguage/data/script.8.errors.txt | 1 + .../auto/declarative/qmllanguage/data/script.8.qml | 9 ++++++ .../qmllanguage/data/script.9.errors.txt | 1 + .../auto/declarative/qmllanguage/data/script.9.qml | 7 +++++ tests/auto/declarative/qmllanguage/data/test.js | 0 tests/auto/declarative/qmllanguage/data/test2.js | 0 tests/auto/declarative/qmllanguage/testtypes.h | 19 +++++++++++++ .../declarative/qmllanguage/tst_qmllanguage.cpp | 27 ++++++++++++++++-- 49 files changed, 250 insertions(+), 16 deletions(-) create mode 100644 tests/auto/declarative/qmllanguage/data/NestedErrorsType.qml create mode 100644 tests/auto/declarative/qmllanguage/data/component.1.errors.txt create mode 100644 tests/auto/declarative/qmllanguage/data/component.1.qml create mode 100644 tests/auto/declarative/qmllanguage/data/component.2.errors.txt create mode 100644 tests/auto/declarative/qmllanguage/data/component.2.qml create mode 100644 tests/auto/declarative/qmllanguage/data/component.3.errors.txt create mode 100644 tests/auto/declarative/qmllanguage/data/component.3.qml create mode 100644 tests/auto/declarative/qmllanguage/data/component.4.errors.txt create mode 100644 tests/auto/declarative/qmllanguage/data/component.4.qml create mode 100644 tests/auto/declarative/qmllanguage/data/component.5.errors.txt create mode 100644 tests/auto/declarative/qmllanguage/data/component.5.qml create mode 100644 tests/auto/declarative/qmllanguage/data/component.6.errors.txt create mode 100644 tests/auto/declarative/qmllanguage/data/component.6.qml create mode 100644 tests/auto/declarative/qmllanguage/data/defaultGrouped.errors.txt create mode 100644 tests/auto/declarative/qmllanguage/data/defaultGrouped.qml create mode 100644 tests/auto/declarative/qmllanguage/data/doubleSignal.errors.txt create mode 100644 tests/auto/declarative/qmllanguage/data/doubleSignal.qml create mode 100644 tests/auto/declarative/qmllanguage/data/emptySignal.errors.txt create mode 100644 tests/auto/declarative/qmllanguage/data/emptySignal.qml create mode 100644 tests/auto/declarative/qmllanguage/data/nestedErrors.errors.txt create mode 100644 tests/auto/declarative/qmllanguage/data/nestedErrors.qml create mode 100644 tests/auto/declarative/qmllanguage/data/script.1.errors.txt create mode 100644 tests/auto/declarative/qmllanguage/data/script.1.qml create mode 100644 tests/auto/declarative/qmllanguage/data/script.10.errors.txt create mode 100644 tests/auto/declarative/qmllanguage/data/script.10.qml create mode 100644 tests/auto/declarative/qmllanguage/data/script.11.errors.txt create mode 100644 tests/auto/declarative/qmllanguage/data/script.11.qml create mode 100644 tests/auto/declarative/qmllanguage/data/script.2.errors.txt create mode 100644 tests/auto/declarative/qmllanguage/data/script.2.qml create mode 100644 tests/auto/declarative/qmllanguage/data/script.3.errors.txt create mode 100644 tests/auto/declarative/qmllanguage/data/script.3.qml create mode 100644 tests/auto/declarative/qmllanguage/data/script.4.errors.txt create mode 100644 tests/auto/declarative/qmllanguage/data/script.4.qml create mode 100644 tests/auto/declarative/qmllanguage/data/script.5.errors.txt create mode 100644 tests/auto/declarative/qmllanguage/data/script.5.qml create mode 100644 tests/auto/declarative/qmllanguage/data/script.6.errors.txt create mode 100644 tests/auto/declarative/qmllanguage/data/script.6.qml create mode 100644 tests/auto/declarative/qmllanguage/data/script.7.errors.txt create mode 100644 tests/auto/declarative/qmllanguage/data/script.7.qml create mode 100644 tests/auto/declarative/qmllanguage/data/script.8.errors.txt create mode 100644 tests/auto/declarative/qmllanguage/data/script.8.qml create mode 100644 tests/auto/declarative/qmllanguage/data/script.9.errors.txt create mode 100644 tests/auto/declarative/qmllanguage/data/script.9.qml create mode 100644 tests/auto/declarative/qmllanguage/data/test.js create mode 100644 tests/auto/declarative/qmllanguage/data/test2.js diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp index 3253e72..240f16c 100644 --- a/src/declarative/qml/qmlcompiler.cpp +++ b/src/declarative/qml/qmlcompiler.cpp @@ -814,8 +814,7 @@ void QmlCompiler::genObject(QmlParser::Object *obj) create.create.type = obj->type; if (!output->types.at(create.create.type).type && !obj->bindingBitmask.isEmpty()) { - while (obj->bindingBitmask.size() % 4) - obj->bindingBitmask.append(char(0)); + Q_ASSERT(obj->bindingBitmask.size() % 4 == 0); create.create.bindingBits = output->indexForByteArray(obj->bindingBitmask); } else { @@ -1044,20 +1043,23 @@ bool QmlCompiler::buildComponent(QmlParser::Object *obj, // Find, check and set the "id" property (if any) Property *idProp = 0; if (obj->properties.count() > 1 || - (obj->properties.count() == 1 && obj->properties.begin().key() != "id") || - !obj->scriptBlockObjects.isEmpty()) - COMPILE_EXCEPTION(obj, qApp->translate("QmlCompiler","Invalid component specification")); + (obj->properties.count() == 1 && obj->properties.begin().key() != "id")) + COMPILE_EXCEPTION(*obj->properties.begin(), qApp->translate("QmlCompiler","Invalid component specification")); + + if (!obj->scriptBlockObjects.isEmpty()) + COMPILE_EXCEPTION(obj->scriptBlockObjects.first(), qApp->translate("QmlCompiler","Invalid component specification")); if (obj->properties.count()) idProp = *obj->properties.begin(); + if (idProp && (idProp->value || idProp->values.count() > 1 || !isValidId(idProp->values.first()->primitive()))) - COMPILE_EXCEPTION(obj, qApp->translate("QmlCompiler","Invalid component id specification")); + COMPILE_EXCEPTION(idProp, qApp->translate("QmlCompiler","Invalid component id specification")); if (idProp) { QString idVal = idProp->values.first()->primitive(); if (compileState.ids.contains(idVal)) - COMPILE_EXCEPTION(obj, qApp->translate("QmlCompiler","id is not unique")); + COMPILE_EXCEPTION(idProp, qApp->translate("QmlCompiler","id is not unique")); obj->id = idVal; addId(idVal, obj); @@ -1093,7 +1095,7 @@ bool QmlCompiler::buildScript(QmlParser::Object *obj, QmlParser::Object *script) Property *source = *script->properties.begin(); if (script->defaultProperty) - COMPILE_EXCEPTION(source, qApp->translate("QmlCompiler","Invalid Script block. Specify either the source property or inline script.")); + COMPILE_EXCEPTION(source, qApp->translate("QmlCompiler","Invalid Script block. Specify either the source property or inline script")); if (source->value || source->values.count() != 1 || source->values.at(0)->object || !source->values.at(0)->value.isString()) @@ -1180,12 +1182,10 @@ bool QmlCompiler::buildComponentFromRoot(QmlParser::Object *obj, bool QmlCompiler::buildSubObject(Object *obj, const BindingContext &ctxt) { Q_ASSERT(obj->metatype); + Q_ASSERT(!obj->defaultProperty); Q_ASSERT(ctxt.isSubContext()); // sub-objects must always be in a binding // sub-context - if (obj->defaultProperty) - COMPILE_CHECK(buildProperty(obj->defaultProperty, obj, ctxt)); - foreach(Property *prop, obj->properties) { if (isSignalPropertyName(prop->name)) { COMPILE_CHECK(buildSignal(prop, obj, ctxt)); @@ -1230,9 +1230,7 @@ bool QmlCompiler::buildSignal(QmlParser::Property *prop, QmlParser::Object *obj, const BindingContext &ctxt) { Q_ASSERT(obj->metaObject()); - - if (prop->isEmpty()) - COMPILE_EXCEPTION(prop, qApp->translate("QmlCompiler","Empty property assignment")); + Q_ASSERT(!prop->isEmpty()); QByteArray name = prop->name; Q_ASSERT(name.startsWith("on")); @@ -1261,6 +1259,10 @@ bool QmlCompiler::buildSignal(QmlParser::Property *prop, QmlParser::Object *obj, prop->values.at(0)->type = Value::SignalObject; } else { prop->values.at(0)->type = Value::SignalExpression; + + QString script = prop->values.at(0)->value.asScript().trimmed(); + if (script.isEmpty()) + COMPILE_EXCEPTION(prop, qApp->translate("QmlCompiler","Empty signal assignment")); } } @@ -1701,6 +1703,9 @@ bool QmlCompiler::buildGroupedProperty(QmlParser::Property *prop, Q_ASSERT(prop->type != 0); Q_ASSERT(prop->index != -1); + if (prop->values.count()) + COMPILE_EXCEPTION(prop->values.first(), qApp->translate("QmlCompiler", "Invalid value in grouped property")); + if (prop->type < (int)QVariant::UserType) { QmlEnginePrivate *ep = static_cast(QObjectPrivate::get(engine)); diff --git a/tests/auto/declarative/qmllanguage/data/NestedErrorsType.qml b/tests/auto/declarative/qmllanguage/data/NestedErrorsType.qml new file mode 100644 index 0000000..5cc8d20 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/NestedErrorsType.qml @@ -0,0 +1,5 @@ +import Qt 4.6 + +Item { + x: "You can't assign a string to a real!" +} diff --git a/tests/auto/declarative/qmllanguage/data/assignBasicTypes.qml b/tests/auto/declarative/qmllanguage/data/assignBasicTypes.qml index cef9f8d..50723a3 100644 --- a/tests/auto/declarative/qmllanguage/data/assignBasicTypes.qml +++ b/tests/auto/declarative/qmllanguage/data/assignBasicTypes.qml @@ -7,6 +7,7 @@ MyTypeObject { intProperty: -19 realProperty: 23.2 doubleProperty: -19.7 + floatProperty: 8.5 colorProperty: "red" dateProperty: "1982-11-25" timeProperty: "11:11:31" @@ -21,6 +22,7 @@ MyTypeObject { rectFProperty: "1000.1,-10.9,400x90.99" boolProperty: true variantProperty: "Hello World!" + vectorProperty: "10,1,2.2" objectProperty: MyTypeObject { intProperty: 8 } } diff --git a/tests/auto/declarative/qmllanguage/data/component.1.errors.txt b/tests/auto/declarative/qmllanguage/data/component.1.errors.txt new file mode 100644 index 0000000..091aad6 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/component.1.errors.txt @@ -0,0 +1 @@ +3:1:Cannot create empty component specification diff --git a/tests/auto/declarative/qmllanguage/data/component.1.qml b/tests/auto/declarative/qmllanguage/data/component.1.qml new file mode 100644 index 0000000..07e463a --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/component.1.qml @@ -0,0 +1,4 @@ +import Qt 4.6 + +Component { +} diff --git a/tests/auto/declarative/qmllanguage/data/component.2.errors.txt b/tests/auto/declarative/qmllanguage/data/component.2.errors.txt new file mode 100644 index 0000000..76e7656 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/component.2.errors.txt @@ -0,0 +1 @@ +6:9:id is not unique diff --git a/tests/auto/declarative/qmllanguage/data/component.2.qml b/tests/auto/declarative/qmllanguage/data/component.2.qml new file mode 100644 index 0000000..74a4f89 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/component.2.qml @@ -0,0 +1,9 @@ +import Qt 4.6 + +Item { + id: myId + Component { + id: myId + Object {} + } +} diff --git a/tests/auto/declarative/qmllanguage/data/component.3.errors.txt b/tests/auto/declarative/qmllanguage/data/component.3.errors.txt new file mode 100644 index 0000000..9a13142 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/component.3.errors.txt @@ -0,0 +1 @@ +6:9:Invalid component id specification diff --git a/tests/auto/declarative/qmllanguage/data/component.3.qml b/tests/auto/declarative/qmllanguage/data/component.3.qml new file mode 100644 index 0000000..043cb6b --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/component.3.qml @@ -0,0 +1,9 @@ +import Qt 4.6 + +Item { + Component { + id: myId + id: myId2 + Object {} + } +} diff --git a/tests/auto/declarative/qmllanguage/data/component.4.errors.txt b/tests/auto/declarative/qmllanguage/data/component.4.errors.txt new file mode 100644 index 0000000..2ab18685 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/component.4.errors.txt @@ -0,0 +1 @@ +3:1:Invalid component body specification diff --git a/tests/auto/declarative/qmllanguage/data/component.4.qml b/tests/auto/declarative/qmllanguage/data/component.4.qml new file mode 100644 index 0000000..3d115ba --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/component.4.qml @@ -0,0 +1,6 @@ +import Qt 4.6 + +Component { + Object {} + Object {} +} diff --git a/tests/auto/declarative/qmllanguage/data/component.5.errors.txt b/tests/auto/declarative/qmllanguage/data/component.5.errors.txt new file mode 100644 index 0000000..5e88900 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/component.5.errors.txt @@ -0,0 +1 @@ +4:5:Invalid component specification diff --git a/tests/auto/declarative/qmllanguage/data/component.5.qml b/tests/auto/declarative/qmllanguage/data/component.5.qml new file mode 100644 index 0000000..ab57622 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/component.5.qml @@ -0,0 +1,6 @@ +import Qt 4.6 + +Component { + x: 10 + Object {} +} diff --git a/tests/auto/declarative/qmllanguage/data/component.6.errors.txt b/tests/auto/declarative/qmllanguage/data/component.6.errors.txt new file mode 100644 index 0000000..2b1c6ca --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/component.6.errors.txt @@ -0,0 +1 @@ +4:5:Invalid component id specification diff --git a/tests/auto/declarative/qmllanguage/data/component.6.qml b/tests/auto/declarative/qmllanguage/data/component.6.qml new file mode 100644 index 0000000..6adaf0d --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/component.6.qml @@ -0,0 +1,6 @@ +import Qt 4.6 + +Component { + id: Object {} + Object {} +} diff --git a/tests/auto/declarative/qmllanguage/data/defaultGrouped.errors.txt b/tests/auto/declarative/qmllanguage/data/defaultGrouped.errors.txt new file mode 100644 index 0000000..945d51b --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/defaultGrouped.errors.txt @@ -0,0 +1 @@ +7:9:Invalid value in grouped property diff --git a/tests/auto/declarative/qmllanguage/data/defaultGrouped.qml b/tests/auto/declarative/qmllanguage/data/defaultGrouped.qml new file mode 100644 index 0000000..39ac5e0 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/defaultGrouped.qml @@ -0,0 +1,10 @@ +import Test 1.0 +import Qt 4.6 + +MyTypeObject { + grouped { + script: print(1921) + Object {} + } +} + diff --git a/tests/auto/declarative/qmllanguage/data/doubleSignal.errors.txt b/tests/auto/declarative/qmllanguage/data/doubleSignal.errors.txt new file mode 100644 index 0000000..2aea251 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/doubleSignal.errors.txt @@ -0,0 +1 @@ +5:5:Incorrectly specified signal diff --git a/tests/auto/declarative/qmllanguage/data/doubleSignal.qml b/tests/auto/declarative/qmllanguage/data/doubleSignal.qml new file mode 100644 index 0000000..ec813c9 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/doubleSignal.qml @@ -0,0 +1,7 @@ +import Test 1.0 + +MyQmlObject { + onBasicSignal: print(1921) + onBasicSignal: print(1921) +} + diff --git a/tests/auto/declarative/qmllanguage/data/emptySignal.errors.txt b/tests/auto/declarative/qmllanguage/data/emptySignal.errors.txt new file mode 100644 index 0000000..353bbf5 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/emptySignal.errors.txt @@ -0,0 +1 @@ +4:5:Empty signal assignment diff --git a/tests/auto/declarative/qmllanguage/data/emptySignal.qml b/tests/auto/declarative/qmllanguage/data/emptySignal.qml new file mode 100644 index 0000000..4c5a122 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/emptySignal.qml @@ -0,0 +1,6 @@ +import Test 1.0 + +MyQmlObject { + onBasicSignal: " " +} + diff --git a/tests/auto/declarative/qmllanguage/data/nestedErrors.errors.txt b/tests/auto/declarative/qmllanguage/data/nestedErrors.errors.txt new file mode 100644 index 0000000..886da55 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/nestedErrors.errors.txt @@ -0,0 +1,2 @@ +4:5:Unable to create type NestedErrorsType +4:8:Invalid property assignment: double expected diff --git a/tests/auto/declarative/qmllanguage/data/nestedErrors.qml b/tests/auto/declarative/qmllanguage/data/nestedErrors.qml new file mode 100644 index 0000000..c0d755a --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/nestedErrors.qml @@ -0,0 +1,6 @@ +import Qt 4.6 + +Item { + NestedErrorsType {} +} + diff --git a/tests/auto/declarative/qmllanguage/data/script.1.errors.txt b/tests/auto/declarative/qmllanguage/data/script.1.errors.txt new file mode 100644 index 0000000..50518cc --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.1.errors.txt @@ -0,0 +1 @@ +3:1:Invalid use of Script block diff --git a/tests/auto/declarative/qmllanguage/data/script.1.qml b/tests/auto/declarative/qmllanguage/data/script.1.qml new file mode 100644 index 0000000..8dac8b7 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.1.qml @@ -0,0 +1,4 @@ +import Qt 4.6 + +Script { +} diff --git a/tests/auto/declarative/qmllanguage/data/script.10.errors.txt b/tests/auto/declarative/qmllanguage/data/script.10.errors.txt new file mode 100644 index 0000000..8299d23 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.10.errors.txt @@ -0,0 +1 @@ +6:9:Invalid component specification diff --git a/tests/auto/declarative/qmllanguage/data/script.10.qml b/tests/auto/declarative/qmllanguage/data/script.10.qml new file mode 100644 index 0000000..516e878 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.10.qml @@ -0,0 +1,9 @@ +import Qt 4.6 + +Item { + Component { + Item {} + Script {} + } +} + diff --git a/tests/auto/declarative/qmllanguage/data/script.11.errors.txt b/tests/auto/declarative/qmllanguage/data/script.11.errors.txt new file mode 100644 index 0000000..a664203 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.11.errors.txt @@ -0,0 +1 @@ +5:9:Invalid Script block diff --git a/tests/auto/declarative/qmllanguage/data/script.11.qml b/tests/auto/declarative/qmllanguage/data/script.11.qml new file mode 100644 index 0000000..d8313a3 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.11.qml @@ -0,0 +1,7 @@ +import Qt 4.6 + +Object { + Script { + Object {} + } +} diff --git a/tests/auto/declarative/qmllanguage/data/script.2.errors.txt b/tests/auto/declarative/qmllanguage/data/script.2.errors.txt new file mode 100644 index 0000000..8fb3bbd --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.2.errors.txt @@ -0,0 +1 @@ +5:9:Properties cannot be set on Script block diff --git a/tests/auto/declarative/qmllanguage/data/script.2.qml b/tests/auto/declarative/qmllanguage/data/script.2.qml new file mode 100644 index 0000000..18bb7c8 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.2.qml @@ -0,0 +1,7 @@ +import Qt 4.6 + +Object { + Script { + id: myScript + } +} diff --git a/tests/auto/declarative/qmllanguage/data/script.3.errors.txt b/tests/auto/declarative/qmllanguage/data/script.3.errors.txt new file mode 100644 index 0000000..8fb3bbd --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.3.errors.txt @@ -0,0 +1 @@ +5:9:Properties cannot be set on Script block diff --git a/tests/auto/declarative/qmllanguage/data/script.3.qml b/tests/auto/declarative/qmllanguage/data/script.3.qml new file mode 100644 index 0000000..c2296ff --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.3.qml @@ -0,0 +1,7 @@ +import Qt 4.6 + +Object { + Script { + hello: world + } +} diff --git a/tests/auto/declarative/qmllanguage/data/script.4.errors.txt b/tests/auto/declarative/qmllanguage/data/script.4.errors.txt new file mode 100644 index 0000000..49a507f --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.4.errors.txt @@ -0,0 +1 @@ +5:9:Invalid Script source value diff --git a/tests/auto/declarative/qmllanguage/data/script.4.qml b/tests/auto/declarative/qmllanguage/data/script.4.qml new file mode 100644 index 0000000..08115c2 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.4.qml @@ -0,0 +1,8 @@ +import Qt 4.6 + +Object { + Script { + source: 10 + } +} + diff --git a/tests/auto/declarative/qmllanguage/data/script.5.errors.txt b/tests/auto/declarative/qmllanguage/data/script.5.errors.txt new file mode 100644 index 0000000..49a507f --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.5.errors.txt @@ -0,0 +1 @@ +5:9:Invalid Script source value diff --git a/tests/auto/declarative/qmllanguage/data/script.5.qml b/tests/auto/declarative/qmllanguage/data/script.5.qml new file mode 100644 index 0000000..a3b1a15 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.5.qml @@ -0,0 +1,9 @@ +import Qt 4.6 + +Object { + Script { + source: "hello" + ".js" + } +} + + diff --git a/tests/auto/declarative/qmllanguage/data/script.6.errors.txt b/tests/auto/declarative/qmllanguage/data/script.6.errors.txt new file mode 100644 index 0000000..4e53b6b --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.6.errors.txt @@ -0,0 +1 @@ +5:9:Invalid Script block. Specify either the source property or inline script diff --git a/tests/auto/declarative/qmllanguage/data/script.6.qml b/tests/auto/declarative/qmllanguage/data/script.6.qml new file mode 100644 index 0000000..e578629 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.6.qml @@ -0,0 +1,11 @@ +import Qt 4.6 + +Object { + Script { + source: "test.js" + function helloWorld() {} + } +} + + + diff --git a/tests/auto/declarative/qmllanguage/data/script.7.errors.txt b/tests/auto/declarative/qmllanguage/data/script.7.errors.txt new file mode 100644 index 0000000..dc15ddf --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.7.errors.txt @@ -0,0 +1 @@ +5:9:Variable declarations not allow in inline Script blocks diff --git a/tests/auto/declarative/qmllanguage/data/script.7.qml b/tests/auto/declarative/qmllanguage/data/script.7.qml new file mode 100644 index 0000000..6bee3f9 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.7.qml @@ -0,0 +1,11 @@ +import Qt 4.6 + +Object { + Script { + var a = 10; + } +} + + + + diff --git a/tests/auto/declarative/qmllanguage/data/script.8.errors.txt b/tests/auto/declarative/qmllanguage/data/script.8.errors.txt new file mode 100644 index 0000000..b5bf1a8 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.8.errors.txt @@ -0,0 +1 @@ +6:9:Invalid Script source value diff --git a/tests/auto/declarative/qmllanguage/data/script.8.qml b/tests/auto/declarative/qmllanguage/data/script.8.qml new file mode 100644 index 0000000..55bc05c --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.8.qml @@ -0,0 +1,9 @@ +import Qt 4.6 + +Object { + Script { + source: "test.js" + source: "test2.js" + } +} + diff --git a/tests/auto/declarative/qmllanguage/data/script.9.errors.txt b/tests/auto/declarative/qmllanguage/data/script.9.errors.txt new file mode 100644 index 0000000..dc1eb53 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.9.errors.txt @@ -0,0 +1 @@ +5:9:Invalid component specification diff --git a/tests/auto/declarative/qmllanguage/data/script.9.qml b/tests/auto/declarative/qmllanguage/data/script.9.qml new file mode 100644 index 0000000..79aa504 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/script.9.qml @@ -0,0 +1,7 @@ +import Qt 4.6 + +Item { + Component { + Script {} + } +} diff --git a/tests/auto/declarative/qmllanguage/data/test.js b/tests/auto/declarative/qmllanguage/data/test.js new file mode 100644 index 0000000..e69de29 diff --git a/tests/auto/declarative/qmllanguage/data/test2.js b/tests/auto/declarative/qmllanguage/data/test2.js new file mode 100644 index 0000000..e69de29 diff --git a/tests/auto/declarative/qmllanguage/testtypes.h b/tests/auto/declarative/qmllanguage/testtypes.h index 91c6e2e..e654faa 100644 --- a/tests/auto/declarative/qmllanguage/testtypes.h +++ b/tests/auto/declarative/qmllanguage/testtypes.h @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -185,6 +186,7 @@ class MyTypeObject : public QObject Q_PROPERTY(int intProperty READ intProperty WRITE setIntProperty); Q_PROPERTY(qreal realProperty READ realProperty WRITE setRealProperty); Q_PROPERTY(double doubleProperty READ doubleProperty WRITE setDoubleProperty); + Q_PROPERTY(float floatProperty READ floatProperty WRITE setFloatProperty); Q_PROPERTY(QColor colorProperty READ colorProperty WRITE setColorProperty); Q_PROPERTY(QDate dateProperty READ dateProperty WRITE setDateProperty); Q_PROPERTY(QTime timeProperty READ timeProperty WRITE setTimeProperty); @@ -198,6 +200,7 @@ class MyTypeObject : public QObject Q_PROPERTY(QRectF rectFProperty READ rectFProperty WRITE setRectFProperty); Q_PROPERTY(bool boolProperty READ boolProperty WRITE setBoolProperty); Q_PROPERTY(QVariant variantProperty READ variantProperty WRITE setVariantProperty); + Q_PROPERTY(QVector3D vectorProperty READ vectorProperty WRITE setVectorProperty); Q_PROPERTY(QmlScriptString scriptProperty READ scriptProperty WRITE setScriptProperty); Q_PROPERTY(MyGroupedObject *grouped READ grouped CONSTANT); @@ -289,6 +292,14 @@ public: doublePropertyValue = v; } + float floatPropertyValue; + float floatProperty() const { + return floatPropertyValue; + } + void setFloatProperty(const float &v) { + floatPropertyValue = v; + } + QColor colorPropertyValue; QColor colorProperty() const { return colorPropertyValue; @@ -394,6 +405,14 @@ public: variantPropertyValue = v; } + QVector3D vectorPropertyValue; + QVector3D vectorProperty() const { + return vectorPropertyValue; + } + void setVectorProperty(const QVector3D &v) { + vectorPropertyValue = v; + } + QmlScriptString scriptPropertyValue; QmlScriptString scriptProperty() const { return scriptPropertyValue; diff --git a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp index da586d9..8e0dd3e 100644 --- a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp +++ b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp @@ -246,8 +246,29 @@ void tst_qmllanguage::errors_data() QTest::newRow("importVersionMissing (builtin)") << "importVersionMissingBuiltIn.qml" << "importVersionMissingBuiltIn.errors.txt" << false; QTest::newRow("importVersionMissing (installed)") << "importVersionMissingInstalled.qml" << "importVersionMissingInstalled.errors.txt" << false; - - + QTest::newRow("Script.1") << "script.1.qml" << "script.1.errors.txt" << false; + QTest::newRow("Script.2") << "script.2.qml" << "script.2.errors.txt" << false; + QTest::newRow("Script.3") << "script.3.qml" << "script.3.errors.txt" << false; + QTest::newRow("Script.4") << "script.4.qml" << "script.4.errors.txt" << false; + QTest::newRow("Script.5") << "script.5.qml" << "script.5.errors.txt" << false; + QTest::newRow("Script.6") << "script.6.qml" << "script.6.errors.txt" << false; + QTest::newRow("Script.7") << "script.7.qml" << "script.7.errors.txt" << false; + QTest::newRow("Script.8") << "script.8.qml" << "script.8.errors.txt" << false; + QTest::newRow("Script.9") << "script.9.qml" << "script.9.errors.txt" << false; + QTest::newRow("Script.10") << "script.10.qml" << "script.10.errors.txt" << false; + QTest::newRow("Script.11") << "script.11.qml" << "script.11.errors.txt" << false; + + QTest::newRow("Component.1") << "component.1.qml" << "component.1.errors.txt" << false; + QTest::newRow("Component.2") << "component.2.qml" << "component.2.errors.txt" << false; + QTest::newRow("Component.3") << "component.3.qml" << "component.3.errors.txt" << false; + QTest::newRow("Component.4") << "component.4.qml" << "component.4.errors.txt" << false; + QTest::newRow("Component.5") << "component.5.qml" << "component.5.errors.txt" << false; + QTest::newRow("Component.6") << "component.6.qml" << "component.6.errors.txt" << false; + + QTest::newRow("nestedErrors") << "nestedErrors.qml" << "nestedErrors.errors.txt" << false; + QTest::newRow("defaultGrouped") << "defaultGrouped.qml" << "defaultGrouped.errors.txt" << false; + QTest::newRow("emptySignal") << "emptySignal.qml" << "emptySignal.errors.txt" << false; + QTest::newRow("doubleSignal") << "doubleSignal.qml" << "doubleSignal.errors.txt" << false; } void tst_qmllanguage::errors() @@ -371,6 +392,7 @@ void tst_qmllanguage::assignBasicTypes() QCOMPARE(object->intProperty(), -19); QCOMPARE((float)object->realProperty(), float(23.2)); QCOMPARE((float)object->doubleProperty(), float(-19.7)); + QCOMPARE((float)object->floatProperty(), float(8.5)); QCOMPARE(object->colorProperty(), QColor("red")); QCOMPARE(object->dateProperty(), QDate(1982, 11, 25)); QCOMPARE(object->timeProperty(), QTime(11, 11, 32)); @@ -383,6 +405,7 @@ void tst_qmllanguage::assignBasicTypes() QCOMPARE(object->rectFProperty(), QRectF((float)1000.1, (float)-10.9, (float)400, (float)90.99)); QCOMPARE(object->boolProperty(), true); QCOMPARE(object->variantProperty(), QVariant("Hello World!")); + QCOMPARE(object->vectorProperty(), QVector3D(10, 1, 2.2)); QVERIFY(object->objectProperty() != 0); MyTypeObject *child = qobject_cast(object->objectProperty()); QVERIFY(child != 0); -- cgit v0.12 From 4a185128d214acd29ee7c6d7f641311306e06fe5 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Wed, 4 Nov 2009 12:21:38 +1000 Subject: Ignore gcov files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 926de5b..f75cc75 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,7 @@ Makefile* *.prl *.app *.pro.user +*.gcov bin/Qt*.dll bin/assistant* bin/designer* -- cgit v0.12 From 48ea5a5c74620f9811debc6bf1e49bf095d30722 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Wed, 4 Nov 2009 15:49:26 +1000 Subject: tests --- src/declarative/qml/qmlmetaproperty.cpp | 112 +-- src/declarative/qml/qmlmetaproperty.h | 6 +- src/declarative/qml/qmlmetaproperty_p.h | 5 +- tests/auto/declarative/qmllanguage/qmllanguage.pro | 1 + .../declarative/qmllanguage/tst_qmllanguage.cpp | 5 +- .../qmlmetaproperty/tst_qmlmetaproperty.cpp | 820 ++++++++++++++++++++- 6 files changed, 856 insertions(+), 93 deletions(-) diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp index 8385352..28878b8 100644 --- a/src/declarative/qml/qmlmetaproperty.cpp +++ b/src/declarative/qml/qmlmetaproperty.cpp @@ -111,27 +111,12 @@ void QmlMetaPropertyPrivate::initDefault(QObject *obj) if (!obj) return; - object = obj; QMetaProperty p = QmlMetaType::defaultProperty(obj); core.load(p); - if (core.isValid()) + if (core.isValid()) { isDefaultProperty = true; -} - -/*! - \internal - - Creates a QmlMetaProperty for the property at index \a idx of \a obj. - */ -QmlMetaProperty::QmlMetaProperty(QObject *obj, int idx, QmlContext *ctxt) -: d(new QmlMetaPropertyPrivate) -{ - Q_ASSERT(obj); - - d->q = this; - d->context = ctxt; - d->object = obj; - d->core.load(obj->metaObject()->property(idx)); + object = obj; + } } /*! @@ -142,6 +127,7 @@ QmlMetaProperty::QmlMetaProperty(QObject *obj, const QString &name) { d->q = this; d->initProperty(obj, name); + if (!isValid()) d->object = 0; } /*! @@ -154,6 +140,7 @@ QmlMetaProperty::QmlMetaProperty(QObject *obj, const QString &name, QmlContext * d->q = this; d->context = ctxt; d->initProperty(obj, name); + if (!isValid()) { d->object = 0; d->context = 0; } } void QmlMetaPropertyPrivate::initProperty(QObject *obj, const QString &name) @@ -425,12 +412,14 @@ bool QmlMetaProperty::isWritable() const { QmlMetaProperty::PropertyCategory category = propertyCategory(); + if (!d->object) + return false; if (category == List || category == QmlList) return true; else if (type() & SignalProperty) - return true; + return false; else if (d->core.isValid() && d->object) - return d->object->metaObject()->property(d->core.coreIndex).isWritable(); + return d->core.flags & QmlPropertyCache::Data::IsWritable; else return false; } @@ -456,25 +445,6 @@ bool QmlMetaProperty::isValid() const } /*! - Returns all of \a obj's Qt properties. -*/ -QStringList QmlMetaProperty::properties(QObject *obj) -{ - // ### What is this used for? - if (!obj) - return QStringList(); - - QStringList rv; - const QMetaObject *mo = obj->metaObject(); - for (int ii = 0; ii < mo->propertyCount(); ++ii) { - QMetaProperty prop = mo->property(ii); - rv << QString::fromUtf8(prop.name()); - } - - return rv; -} - -/*! Return the name of this QML property. */ QString QmlMetaProperty::name() const @@ -494,7 +464,13 @@ QString QmlMetaProperty::name() const return rv; } else { - return d->core.name; + if (type() & SignalProperty) { + QString name = QLatin1String("on") + d->core.name; + name[2] = name.at(2).toUpper(); + return name; + } else { + return d->core.name; + } } } @@ -562,8 +538,10 @@ QmlAbstractBinding *QmlMetaProperty::binding() const QmlAbstractBinding * QmlMetaProperty::setBinding(QmlAbstractBinding *newBinding, QmlMetaProperty::WriteFlags flags) const { - if (!isProperty() || (type() & Attached) || !d->object) + if (!isProperty() || (type() & Attached) || !d->object) { + delete newBinding; return 0; + } return d->setBinding(d->object, d->core, newBinding, flags); } @@ -627,8 +605,10 @@ QmlExpression *QmlMetaProperty::signalExpression() const */ QmlExpression *QmlMetaProperty::setSignalExpression(QmlExpression *expr) const { - if (!(type() & SignalProperty)) + if (!(type() & SignalProperty)) { + delete expr; return 0; + } const QObjectList &children = d->object->children(); @@ -683,13 +663,7 @@ QVariant QmlMetaProperty::read() const if (type() & SignalProperty) { - const QObjectList &children = object()->children(); - - for (int ii = 0; ii < children.count(); ++ii) { - QmlBoundSignal *sig = QmlBoundSignal::cast(children.at(ii)); - if (sig && sig->index() == d->core.coreIndex) - return sig->expression()->expression(); - } + return QVariant(); } else if (type() & Property) { @@ -854,7 +828,7 @@ bool QmlMetaPropertyPrivate::write(QObject *object, const QmlPropertyCache::Data return false; if (context && u.isRelative() && !u.isEmpty()) - u = context->baseUrl().resolved(u); + u = context->resolvedUrl(u); int status = -1; void *argv[] = { &u, 0, &status, &flags }; QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, argv); @@ -987,7 +961,7 @@ bool QmlMetaProperty::write(const QVariant &value) const bool QmlMetaProperty::write(const QVariant &value, QmlMetaProperty::WriteFlags flags) const { - if (d->object && type() & Property && d->core.isValid()) + if (d->object && type() & Property && d->core.isValid() && isWritable()) return d->writeValueProperty(value, flags); else return false; @@ -1080,27 +1054,6 @@ Q_GLOBAL_STATIC(QmlValueTypeFactory, qmlValueTypes); Returns the property information serialized into a single integer. QmlMetaProperty uses the bottom 24 bits only. */ -quint32 QmlMetaProperty::save() const -{ - quint32 rv = 0; - if (type() & Attached) { - rv = d->attachedFunc; - } else if (type() != Invalid) { - rv = d->core.coreIndex; - } - - Q_ASSERT(rv <= 0x7FF); - Q_ASSERT(type() <= 0x3F); - Q_ASSERT(d->valueTypeCoreIdx <= 0x7F); - - rv |= (type() << 18); - - if (type() & ValueTypeProperty) - rv |= (d->valueTypeCoreIdx << 11); - - return rv; -} - quint32 QmlMetaPropertyPrivate::saveValueType(int core, int valueType) { Q_ASSERT(core <= 0x7FF); @@ -1127,8 +1080,11 @@ quint32 QmlMetaPropertyPrivate::saveProperty(int core) to QmlMetaProperty::save(). Only the bottom 24-bits are used, the high bits can be set to any value. */ -void QmlMetaProperty::restore(quint32 id, QObject *obj, QmlContext *ctxt) +void QmlMetaPropertyPrivate::restore(QmlMetaProperty &prop, quint32 id, + QObject *obj, QmlContext *ctxt) { + QmlMetaPropertyPrivate *d = prop.d; + QmlEnginePrivate *enginePrivate = 0; if (ctxt && ctxt->engine()) enginePrivate = QmlEnginePrivate::get(ctxt->engine()); @@ -1140,9 +1096,9 @@ void QmlMetaProperty::restore(quint32 id, QObject *obj, QmlContext *ctxt) uint type = id >> 18; id &= 0xFFFF; - if (type & Attached) { + if (type & QmlMetaProperty::Attached) { d->attachedFunc = id; - } else if (type & ValueTypeProperty) { + } else if (type & QmlMetaProperty::ValueTypeProperty) { int coreIdx = id & 0x7FF; int valueTypeIdx = id >> 11; @@ -1156,7 +1112,7 @@ void QmlMetaProperty::restore(quint32 id, QObject *obj, QmlContext *ctxt) d->core.load(p); d->valueTypeCoreIdx = valueTypeIdx; d->valueTypePropType = p2.userType(); - } else if (type & Property) { + } else if (type & QmlMetaProperty::Property) { QmlPropertyCache *cache = enginePrivate?enginePrivate->cache(obj):0; @@ -1168,12 +1124,12 @@ void QmlMetaProperty::restore(quint32 id, QObject *obj, QmlContext *ctxt) d->core.load(p); } - } else if (type & SignalProperty) { + } else if (type & QmlMetaProperty::SignalProperty) { QMetaMethod method = obj->metaObject()->method(id); d->core.load(method); } else { - *this = QmlMetaProperty(); + prop = QmlMetaProperty(); } } diff --git a/src/declarative/qml/qmlmetaproperty.h b/src/declarative/qml/qmlmetaproperty.h index ce4ac1e..6db99c6 100644 --- a/src/declarative/qml/qmlmetaproperty.h +++ b/src/declarative/qml/qmlmetaproperty.h @@ -79,10 +79,8 @@ public: QmlMetaProperty(QObject *, const QString &, QmlContext *); QmlMetaProperty(const QmlMetaProperty &); QmlMetaProperty &operator=(const QmlMetaProperty &); - QmlMetaProperty(QObject *, int, QmlContext * = 0); ~QmlMetaProperty(); - static QStringList properties(QObject *); QString name() const; QVariant read() const; @@ -96,9 +94,6 @@ public: bool connectNotifier(QObject *dest, const char *slot) const; bool connectNotifier(QObject *dest, int method) const; - quint32 save() const; - void restore(quint32, QObject *, QmlContext * = 0); - QMetaMethod method() const; enum Type { Invalid = 0x00, @@ -138,6 +133,7 @@ public: int valueTypeCoreIndex() const; private: friend class QmlEnginePrivate; + friend class QmlMetaPropertyPrivate;; QmlMetaPropertyPrivate *d; }; typedef QList QmlMetaProperties; diff --git a/src/declarative/qml/qmlmetaproperty_p.h b/src/declarative/qml/qmlmetaproperty_p.h index 925f1ea..d225afa 100644 --- a/src/declarative/qml/qmlmetaproperty_p.h +++ b/src/declarative/qml/qmlmetaproperty_p.h @@ -104,8 +104,9 @@ public: static QmlAbstractBinding *setBinding(QObject *, const QmlPropertyCache::Data &, QmlAbstractBinding *, QmlMetaProperty::WriteFlags flags = QmlMetaProperty::DontRemoveBinding); - static quint32 saveValueType(int, int); - static quint32 saveProperty(int); + static void Q_AUTOTEST_EXPORT restore(QmlMetaProperty &prop, quint32, QObject *, QmlContext * = 0); + static quint32 Q_AUTOTEST_EXPORT saveValueType(int, int); + static quint32 Q_AUTOTEST_EXPORT saveProperty(int); static bool equal(const QMetaObject *, const QMetaObject *); static bool canConvert(const QMetaObject *from, const QMetaObject *to); diff --git a/tests/auto/declarative/qmllanguage/qmllanguage.pro b/tests/auto/declarative/qmllanguage/qmllanguage.pro index 80228a9..e45d73a 100644 --- a/tests/auto/declarative/qmllanguage/qmllanguage.pro +++ b/tests/auto/declarative/qmllanguage/qmllanguage.pro @@ -1,5 +1,6 @@ load(qttest_p4) contains(QT_CONFIG,declarative): QT += declarative +QT += script macx:CONFIG -= app_bundle SOURCES += tst_qmllanguage.cpp \ diff --git a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp index 8e0dd3e..c82aa4d 100644 --- a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp +++ b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp @@ -45,6 +45,7 @@ #include #include #include +#include #include "testtypes.h" #include "../../../shared/util.h" @@ -638,9 +639,9 @@ void tst_qmllanguage::valueTypes() p.write(13); QCOMPARE(p.read(), QVariant(13)); - quint32 r = p.save(); + quint32 r = QmlMetaPropertyPrivate::saveValueType(p.coreIndex(), p.valueTypeCoreIndex()); QmlMetaProperty p2; - p2.restore(r, object); + QmlMetaPropertyPrivate::restore(p2, r, object); QCOMPARE(p2.read(), QVariant(13)); } diff --git a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp b/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp index 52c673f..7fbffdb 100644 --- a/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp +++ b/tests/auto/declarative/qmlmetaproperty/tst_qmlmetaproperty.cpp @@ -42,6 +42,8 @@ #include #include #include +#include +#include #include class MyQmlObject : public QObject @@ -73,13 +75,27 @@ private: QML_DECLARE_TYPE(MyContainer); QML_DEFINE_TYPE(Test,1,0,0,MyContainer,MyContainer); -class tst_QmlMetaProperty : public QObject +class tst_qmlmetaproperty : public QObject { Q_OBJECT public: - tst_QmlMetaProperty() {} + tst_qmlmetaproperty() {} private slots: + + // Constructors + void qmlmetaproperty(); + void qmlmetaproperty_object(); + void qmlmetaproperty_object_string(); + void qmlmetaproperty_object_context(); + void qmlmetaproperty_object_string_context(); + + // Methods + void name(); + void read(); + void write(); + + // Functionality void writeObjectToList(); void writeListToList(); void writeObjectToQmlList(); @@ -90,7 +106,799 @@ private: QmlEngine engine; }; -void tst_QmlMetaProperty::writeObjectToList() +void tst_qmlmetaproperty::qmlmetaproperty() +{ + QmlMetaProperty prop; + + QGuard binding(new QmlBinding(QString(), 0, 0)); + QVERIFY(binding != 0); + QGuard expression(new QmlExpression()); + QVERIFY(expression != 0); + + QObject *obj = new QObject; + + QCOMPARE(prop.name(), QString()); + QCOMPARE(prop.read(), QVariant()); + QCOMPARE(prop.write(QVariant()), false); + QCOMPARE(prop.hasChangedNotifier(), false); + QCOMPARE(prop.needsChangedNotifier(), false); + QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, 0), false); + QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, -1), false); + QVERIFY(prop.method().signature() == 0); + QCOMPARE(prop.type(), QmlMetaProperty::Invalid); + QCOMPARE(prop.isProperty(), false); + QCOMPARE(prop.isDefault(), false); + QCOMPARE(prop.isWritable(), false); + QCOMPARE(prop.isDesignable(), false); + QCOMPARE(prop.isValid(), false); + QCOMPARE(prop.object(), (QObject *)0); + QCOMPARE(prop.propertyCategory(), QmlMetaProperty::InvalidProperty); + QCOMPARE(prop.propertyType(), 0); + QCOMPARE(prop.propertyTypeName(), (const char *)0); + QVERIFY(prop.property().name() == 0); + QVERIFY(prop.binding() == 0); + QVERIFY(prop.setBinding(binding) == 0); + QVERIFY(binding == 0); + QVERIFY(prop.signalExpression() == 0); + QVERIFY(prop.setSignalExpression(expression) == 0); + QVERIFY(expression == 0); + QCOMPARE(prop.coreIndex(), -1); + QCOMPARE(prop.valueTypeCoreIndex(), -1); + + delete obj; +} + +class PropertyObject : public QObject +{ + Q_OBJECT + Q_PROPERTY(int defaultProperty READ defaultProperty); + Q_PROPERTY(QRect rectProperty READ rectProperty); + Q_PROPERTY(QRect wrectProperty READ wrectProperty WRITE setWRectProperty); + Q_PROPERTY(QUrl url READ url WRITE setUrl); + + Q_CLASSINFO("DefaultProperty", "defaultProperty"); +public: + int defaultProperty() { return 10; } + QRect rectProperty() { return QRect(10, 10, 1, 209); } + + QRect wrectProperty() { return m_rect; } + void setWRectProperty(const QRect &r) { m_rect = r; } + + QUrl url() { return m_url; } + void setUrl(const QUrl &u) { m_url = u; } + +signals: + void clicked(); + +private: + QRect m_rect; + QUrl m_url; +}; + +void tst_qmlmetaproperty::qmlmetaproperty_object() +{ + QObject object; // Has no default property + PropertyObject dobject; // Has default property + + { + QmlMetaProperty prop(&object); + + QGuard binding(new QmlBinding(QString(), 0, 0)); + QVERIFY(binding != 0); + QGuard expression(new QmlExpression()); + QVERIFY(expression != 0); + + QObject *obj = new QObject; + + QCOMPARE(prop.name(), QString()); + QCOMPARE(prop.read(), QVariant()); + QCOMPARE(prop.write(QVariant()), false); + QCOMPARE(prop.hasChangedNotifier(), false); + QCOMPARE(prop.needsChangedNotifier(), false); + QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, 0), false); + QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, -1), false); + QVERIFY(prop.method().signature() == 0); + QCOMPARE(prop.type(), QmlMetaProperty::Invalid); + QCOMPARE(prop.isProperty(), false); + QCOMPARE(prop.isDefault(), false); + QCOMPARE(prop.isWritable(), false); + QCOMPARE(prop.isDesignable(), false); + QCOMPARE(prop.isValid(), false); + QCOMPARE(prop.object(), (QObject *)0); + QCOMPARE(prop.propertyCategory(), QmlMetaProperty::InvalidProperty); + QCOMPARE(prop.propertyType(), 0); + QCOMPARE(prop.propertyTypeName(), (const char *)0); + QVERIFY(prop.property().name() == 0); + QVERIFY(prop.binding() == 0); + QVERIFY(prop.setBinding(binding) == 0); + QVERIFY(binding == 0); + QVERIFY(prop.signalExpression() == 0); + QVERIFY(prop.setSignalExpression(expression) == 0); + QVERIFY(expression == 0); + QCOMPARE(prop.coreIndex(), -1); + QCOMPARE(prop.valueTypeCoreIndex(), -1); + + delete obj; + } + + { + QmlMetaProperty prop(&dobject); + + QGuard binding(new QmlBinding(QString(), 0, 0)); + binding->setTarget(prop); + QVERIFY(binding != 0); + QGuard expression(new QmlExpression()); + QVERIFY(expression != 0); + + QObject *obj = new QObject; + + QCOMPARE(prop.name(), QString("defaultProperty")); + QCOMPARE(prop.read(), QVariant(10)); + QCOMPARE(prop.write(QVariant()), false); + QCOMPARE(prop.hasChangedNotifier(), false); + QCOMPARE(prop.needsChangedNotifier(), true); + QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, 0), false); + QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, -1), false); + QVERIFY(prop.method().signature() == 0); + QCOMPARE(prop.type(), (QmlMetaProperty::Type)(QmlMetaProperty::Property | QmlMetaProperty::Default)); + QCOMPARE(prop.isProperty(), true); + QCOMPARE(prop.isDefault(), true); + QCOMPARE(prop.isWritable(), false); + QCOMPARE(prop.isDesignable(), true); + QCOMPARE(prop.isValid(), true); + QCOMPARE(prop.object(), &dobject); + QCOMPARE(prop.propertyCategory(), QmlMetaProperty::Normal); + QCOMPARE(prop.propertyType(), (int)QVariant::Int); + QCOMPARE(prop.propertyTypeName(), "int"); + QCOMPARE(QString(prop.property().name()), QString("defaultProperty")); + QVERIFY(prop.binding() == 0); + QTest::ignoreMessage(QtWarningMsg, ":-1: Unable to assign null to int"); + QVERIFY(prop.setBinding(binding) == 0); + QVERIFY(binding != 0); + QVERIFY(prop.binding() == binding); + QVERIFY(prop.signalExpression() == 0); + QVERIFY(prop.setSignalExpression(expression) == 0); + QVERIFY(expression == 0); + QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty")); + QCOMPARE(prop.valueTypeCoreIndex(), -1); + + delete obj; + } +} + +void tst_qmlmetaproperty::qmlmetaproperty_object_string() +{ + QObject object; + PropertyObject dobject; + + { + QmlMetaProperty prop(&object, QString("defaultProperty")); + + QGuard binding(new QmlBinding(QString(), 0, 0)); + QVERIFY(binding != 0); + QGuard expression(new QmlExpression()); + QVERIFY(expression != 0); + + QObject *obj = new QObject; + + QCOMPARE(prop.name(), QString()); + QCOMPARE(prop.read(), QVariant()); + QCOMPARE(prop.write(QVariant()), false); + QCOMPARE(prop.hasChangedNotifier(), false); + QCOMPARE(prop.needsChangedNotifier(), false); + QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, 0), false); + QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, -1), false); + QVERIFY(prop.method().signature() == 0); + QCOMPARE(prop.type(), QmlMetaProperty::Invalid); + QCOMPARE(prop.isProperty(), false); + QCOMPARE(prop.isDefault(), false); + QCOMPARE(prop.isWritable(), false); + QCOMPARE(prop.isDesignable(), false); + QCOMPARE(prop.isValid(), false); + QCOMPARE(prop.object(), (QObject *)0); + QCOMPARE(prop.propertyCategory(), QmlMetaProperty::InvalidProperty); + QCOMPARE(prop.propertyType(), 0); + QCOMPARE(prop.propertyTypeName(), (const char *)0); + QVERIFY(prop.property().name() == 0); + QVERIFY(prop.binding() == 0); + QVERIFY(prop.setBinding(binding) == 0); + QVERIFY(binding == 0); + QVERIFY(prop.signalExpression() == 0); + QVERIFY(prop.setSignalExpression(expression) == 0); + QVERIFY(expression == 0); + QCOMPARE(prop.coreIndex(), -1); + QCOMPARE(prop.valueTypeCoreIndex(), -1); + + delete obj; + } + + { + QmlMetaProperty prop(&dobject, QString("defaultProperty")); + + QGuard binding(new QmlBinding(QString(), 0, 0)); + binding->setTarget(prop); + QVERIFY(binding != 0); + QGuard expression(new QmlExpression()); + QVERIFY(expression != 0); + + QObject *obj = new QObject; + + QCOMPARE(prop.name(), QString("defaultProperty")); + QCOMPARE(prop.read(), QVariant(10)); + QCOMPARE(prop.write(QVariant()), false); + QCOMPARE(prop.hasChangedNotifier(), false); + QCOMPARE(prop.needsChangedNotifier(), true); + QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, 0), false); + QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, -1), false); + QVERIFY(prop.method().signature() == 0); + QCOMPARE(prop.type(), QmlMetaProperty::Property); + QCOMPARE(prop.isProperty(), true); + QCOMPARE(prop.isDefault(), false); + QCOMPARE(prop.isWritable(), false); + QCOMPARE(prop.isDesignable(), true); + QCOMPARE(prop.isValid(), true); + QCOMPARE(prop.object(), &dobject); + QCOMPARE(prop.propertyCategory(), QmlMetaProperty::Normal); + QCOMPARE(prop.propertyType(), (int)QVariant::Int); + QCOMPARE(prop.propertyTypeName(), "int"); + QCOMPARE(QString(prop.property().name()), QString("defaultProperty")); + QVERIFY(prop.binding() == 0); + QTest::ignoreMessage(QtWarningMsg, ":-1: Unable to assign null to int"); + QVERIFY(prop.setBinding(binding) == 0); + QVERIFY(binding != 0); + QVERIFY(prop.binding() == binding); + QVERIFY(prop.signalExpression() == 0); + QVERIFY(prop.setSignalExpression(expression) == 0); + QVERIFY(expression == 0); + QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty")); + QCOMPARE(prop.valueTypeCoreIndex(), -1); + + delete obj; + } + + { + QmlMetaProperty prop(&dobject, QString("onClicked")); + + QGuard binding(new QmlBinding(QString(), 0, 0)); + binding->setTarget(prop); + QVERIFY(binding != 0); + QGuard expression(new QmlExpression()); + QVERIFY(expression != 0); + + QObject *obj = new QObject; + + QCOMPARE(prop.name(), QString("onClicked")); + QCOMPARE(prop.read(), QVariant()); + QCOMPARE(prop.write(QVariant("Hello")), false); + QCOMPARE(prop.hasChangedNotifier(), false); + QCOMPARE(prop.needsChangedNotifier(), false); + QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, 0), false); + QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, -1), false); + QCOMPARE(QString(prop.method().signature()), QString("clicked()")); + QCOMPARE(prop.type(), QmlMetaProperty::SignalProperty); + QCOMPARE(prop.isProperty(), false); + QCOMPARE(prop.isDefault(), false); + QCOMPARE(prop.isWritable(), false); + QCOMPARE(prop.isDesignable(), false); + QCOMPARE(prop.isValid(), true); + QCOMPARE(prop.object(), &dobject); + QCOMPARE(prop.propertyCategory(), QmlMetaProperty::InvalidProperty); + QCOMPARE(prop.propertyType(), 0); + QCOMPARE(prop.propertyTypeName(), (const char *)0); + QCOMPARE(prop.property().name(), (const char *)0); + QVERIFY(prop.binding() == 0); + QVERIFY(prop.setBinding(binding) == 0); + QVERIFY(binding == 0); + QVERIFY(prop.signalExpression() == 0); + QVERIFY(prop.setSignalExpression(expression) == 0); + QVERIFY(expression != 0); + QVERIFY(prop.signalExpression() == expression); + QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("clicked()")); + QCOMPARE(prop.valueTypeCoreIndex(), -1); + + delete obj; + } +} + +void tst_qmlmetaproperty::qmlmetaproperty_object_context() +{ + QObject object; // Has no default property + PropertyObject dobject; // Has default property + + { + QmlMetaProperty prop(&object, engine.rootContext()); + + QGuard binding(new QmlBinding(QString(), 0, 0)); + QVERIFY(binding != 0); + QGuard expression(new QmlExpression()); + QVERIFY(expression != 0); + + QObject *obj = new QObject; + + QCOMPARE(prop.name(), QString()); + QCOMPARE(prop.read(), QVariant()); + QCOMPARE(prop.write(QVariant()), false); + QCOMPARE(prop.hasChangedNotifier(), false); + QCOMPARE(prop.needsChangedNotifier(), false); + QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, 0), false); + QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, -1), false); + QVERIFY(prop.method().signature() == 0); + QCOMPARE(prop.type(), QmlMetaProperty::Invalid); + QCOMPARE(prop.isProperty(), false); + QCOMPARE(prop.isDefault(), false); + QCOMPARE(prop.isWritable(), false); + QCOMPARE(prop.isDesignable(), false); + QCOMPARE(prop.isValid(), false); + QCOMPARE(prop.object(), (QObject *)0); + QCOMPARE(prop.propertyCategory(), QmlMetaProperty::InvalidProperty); + QCOMPARE(prop.propertyType(), 0); + QCOMPARE(prop.propertyTypeName(), (const char *)0); + QVERIFY(prop.property().name() == 0); + QVERIFY(prop.binding() == 0); + QVERIFY(prop.setBinding(binding) == 0); + QVERIFY(binding == 0); + QVERIFY(prop.signalExpression() == 0); + QVERIFY(prop.setSignalExpression(expression) == 0); + QVERIFY(expression == 0); + QCOMPARE(prop.coreIndex(), -1); + QCOMPARE(prop.valueTypeCoreIndex(), -1); + + delete obj; + } + + { + QmlMetaProperty prop(&dobject, engine.rootContext()); + + QGuard binding(new QmlBinding(QString(), 0, 0)); + binding->setTarget(prop); + QVERIFY(binding != 0); + QGuard expression(new QmlExpression()); + QVERIFY(expression != 0); + + QObject *obj = new QObject; + + QCOMPARE(prop.name(), QString("defaultProperty")); + QCOMPARE(prop.read(), QVariant(10)); + QCOMPARE(prop.write(QVariant()), false); + QCOMPARE(prop.hasChangedNotifier(), false); + QCOMPARE(prop.needsChangedNotifier(), true); + QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, 0), false); + QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, -1), false); + QVERIFY(prop.method().signature() == 0); + QCOMPARE(prop.type(), (QmlMetaProperty::Type)(QmlMetaProperty::Property | QmlMetaProperty::Default)); + QCOMPARE(prop.isProperty(), true); + QCOMPARE(prop.isDefault(), true); + QCOMPARE(prop.isWritable(), false); + QCOMPARE(prop.isDesignable(), true); + QCOMPARE(prop.isValid(), true); + QCOMPARE(prop.object(), &dobject); + QCOMPARE(prop.propertyCategory(), QmlMetaProperty::Normal); + QCOMPARE(prop.propertyType(), (int)QVariant::Int); + QCOMPARE(prop.propertyTypeName(), "int"); + QCOMPARE(QString(prop.property().name()), QString("defaultProperty")); + QVERIFY(prop.binding() == 0); + QTest::ignoreMessage(QtWarningMsg, ":-1: Unable to assign null to int"); + QVERIFY(prop.setBinding(binding) == 0); + QVERIFY(binding != 0); + QVERIFY(prop.binding() == binding); + QVERIFY(prop.signalExpression() == 0); + QVERIFY(prop.setSignalExpression(expression) == 0); + QVERIFY(expression == 0); + QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty")); + QCOMPARE(prop.valueTypeCoreIndex(), -1); + + delete obj; + } +} + +void tst_qmlmetaproperty::qmlmetaproperty_object_string_context() +{ + QObject object; + PropertyObject dobject; + + { + QmlMetaProperty prop(&object, QString("defaultProperty"), engine.rootContext()); + + QGuard binding(new QmlBinding(QString(), 0, 0)); + QVERIFY(binding != 0); + QGuard expression(new QmlExpression()); + QVERIFY(expression != 0); + + QObject *obj = new QObject; + + QCOMPARE(prop.name(), QString()); + QCOMPARE(prop.read(), QVariant()); + QCOMPARE(prop.write(QVariant()), false); + QCOMPARE(prop.hasChangedNotifier(), false); + QCOMPARE(prop.needsChangedNotifier(), false); + QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, 0), false); + QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, -1), false); + QVERIFY(prop.method().signature() == 0); + QCOMPARE(prop.type(), QmlMetaProperty::Invalid); + QCOMPARE(prop.isProperty(), false); + QCOMPARE(prop.isDefault(), false); + QCOMPARE(prop.isWritable(), false); + QCOMPARE(prop.isDesignable(), false); + QCOMPARE(prop.isValid(), false); + QCOMPARE(prop.object(), (QObject *)0); + QCOMPARE(prop.propertyCategory(), QmlMetaProperty::InvalidProperty); + QCOMPARE(prop.propertyType(), 0); + QCOMPARE(prop.propertyTypeName(), (const char *)0); + QVERIFY(prop.property().name() == 0); + QVERIFY(prop.binding() == 0); + QVERIFY(prop.setBinding(binding) == 0); + QVERIFY(binding == 0); + QVERIFY(prop.signalExpression() == 0); + QVERIFY(prop.setSignalExpression(expression) == 0); + QVERIFY(expression == 0); + QCOMPARE(prop.coreIndex(), -1); + QCOMPARE(prop.valueTypeCoreIndex(), -1); + + delete obj; + } + + { + QmlMetaProperty prop(&dobject, QString("defaultProperty"), engine.rootContext()); + + QGuard binding(new QmlBinding(QString(), 0, 0)); + binding->setTarget(prop); + QVERIFY(binding != 0); + QGuard expression(new QmlExpression()); + QVERIFY(expression != 0); + + QObject *obj = new QObject; + + QCOMPARE(prop.name(), QString("defaultProperty")); + QCOMPARE(prop.read(), QVariant(10)); + QCOMPARE(prop.write(QVariant()), false); + QCOMPARE(prop.hasChangedNotifier(), false); + QCOMPARE(prop.needsChangedNotifier(), true); + QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, 0), false); + QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, -1), false); + QVERIFY(prop.method().signature() == 0); + QCOMPARE(prop.type(), QmlMetaProperty::Property); + QCOMPARE(prop.isProperty(), true); + QCOMPARE(prop.isDefault(), false); + QCOMPARE(prop.isWritable(), false); + QCOMPARE(prop.isDesignable(), true); + QCOMPARE(prop.isValid(), true); + QCOMPARE(prop.object(), &dobject); + QCOMPARE(prop.propertyCategory(), QmlMetaProperty::Normal); + QCOMPARE(prop.propertyType(), (int)QVariant::Int); + QCOMPARE(prop.propertyTypeName(), "int"); + QCOMPARE(QString(prop.property().name()), QString("defaultProperty")); + QVERIFY(prop.binding() == 0); + QTest::ignoreMessage(QtWarningMsg, ":-1: Unable to assign null to int"); + QVERIFY(prop.setBinding(binding) == 0); + QVERIFY(binding != 0); + QVERIFY(prop.binding() == binding); + QVERIFY(prop.signalExpression() == 0); + QVERIFY(prop.setSignalExpression(expression) == 0); + QVERIFY(expression == 0); + QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfProperty("defaultProperty")); + QCOMPARE(prop.valueTypeCoreIndex(), -1); + + delete obj; + } + + { + QmlMetaProperty prop(&dobject, QString("onClicked"), engine.rootContext()); + + QGuard binding(new QmlBinding(QString(), 0, 0)); + binding->setTarget(prop); + QVERIFY(binding != 0); + QGuard expression(new QmlExpression()); + QVERIFY(expression != 0); + + QObject *obj = new QObject; + + QCOMPARE(prop.name(), QString("onClicked")); + QCOMPARE(prop.read(), QVariant()); + QCOMPARE(prop.write(QVariant("Hello")), false); + QCOMPARE(prop.hasChangedNotifier(), false); + QCOMPARE(prop.needsChangedNotifier(), false); + QCOMPARE(prop.connectNotifier(0, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, SLOT(deleteLater())), false); + QCOMPARE(prop.connectNotifier(obj, 0), false); + QCOMPARE(prop.connectNotifier(0, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, obj->metaObject()->indexOfMethod("deleteLater()")), false); + QCOMPARE(prop.connectNotifier(obj, -1), false); + QCOMPARE(QString(prop.method().signature()), QString("clicked()")); + QCOMPARE(prop.type(), QmlMetaProperty::SignalProperty); + QCOMPARE(prop.isProperty(), false); + QCOMPARE(prop.isDefault(), false); + QCOMPARE(prop.isWritable(), false); + QCOMPARE(prop.isDesignable(), false); + QCOMPARE(prop.isValid(), true); + QCOMPARE(prop.object(), &dobject); + QCOMPARE(prop.propertyCategory(), QmlMetaProperty::InvalidProperty); + QCOMPARE(prop.propertyType(), 0); + QCOMPARE(prop.propertyTypeName(), (const char *)0); + QCOMPARE(prop.property().name(), (const char *)0); + QVERIFY(prop.binding() == 0); + QVERIFY(prop.setBinding(binding) == 0); + QVERIFY(binding == 0); + QVERIFY(prop.signalExpression() == 0); + QVERIFY(prop.setSignalExpression(expression) == 0); + QVERIFY(expression != 0); + QVERIFY(prop.signalExpression() == expression); + QCOMPARE(prop.coreIndex(), dobject.metaObject()->indexOfMethod("clicked()")); + QCOMPARE(prop.valueTypeCoreIndex(), -1); + + delete obj; + } +} + +void tst_qmlmetaproperty::name() +{ + { + QmlMetaProperty p; + QCOMPARE(p.name(), QString()); + } + + { + PropertyObject o; + QmlMetaProperty p(&o); + QCOMPARE(p.name(), QString("defaultProperty")); + } + + { + QObject o; + QmlMetaProperty p(&o, QString("objectName")); + QCOMPARE(p.name(), QString("objectName")); + } + + { + PropertyObject o; + QmlMetaProperty p(&o, "onClicked"); + QCOMPARE(p.name(), QString("onClicked")); + } + + { + QObject o; + QmlMetaProperty p(&o, "onClicked"); + QCOMPARE(p.name(), QString()); + } + + { + QObject o; + QmlMetaProperty p(&o, "foo"); + QCOMPARE(p.name(), QString()); + } + + { + QmlMetaProperty p(0, "foo"); + QCOMPARE(p.name(), QString()); + } + + { + PropertyObject o; + QmlMetaProperty p = QmlMetaProperty::createProperty(&o, "rectProperty"); + QCOMPARE(p.name(), QString("rectProperty")); + } + + { + PropertyObject o; + QmlMetaProperty p = QmlMetaProperty::createProperty(&o, "rectProperty.x"); + QCOMPARE(p.name(), QString("rectProperty.x")); + } + + { + PropertyObject o; + QmlMetaProperty p = QmlMetaProperty::createProperty(&o, "rectProperty.foo"); + QCOMPARE(p.name(), QString()); + } +} + +void tst_qmlmetaproperty::read() +{ + // Invalid + { + QmlMetaProperty p; + QCOMPARE(p.read(), QVariant()); + } + + // Default prop + { + PropertyObject o; + QmlMetaProperty p(&o); + QCOMPARE(p.read(), QVariant(10)); + } + + // Invalid default prop + { + QObject o; + QmlMetaProperty p(&o); + QCOMPARE(p.read(), QVariant()); + } + + // Value prop by name + { + QObject o; + + QmlMetaProperty p(&o, "objectName"); + QCOMPARE(p.read(), QVariant(QString())); + + o.setObjectName("myName"); + + QCOMPARE(p.read(), QVariant("myName")); + } + + // Value-type prop + { + PropertyObject o; + QmlMetaProperty p = QmlMetaProperty::createProperty(&o, "rectProperty.x"); + QCOMPARE(p.read(), QVariant(10)); + } + + // Invalid value-type prop + { + PropertyObject o; + QmlMetaProperty p = QmlMetaProperty::createProperty(&o, "rectProperty.foo"); + QCOMPARE(p.read(), QVariant()); + } + + // Signal property + { + PropertyObject o; + QmlMetaProperty p(&o, "onClicked"); + QCOMPARE(p.read(), QVariant()); + + QVERIFY(0 == p.setSignalExpression(new QmlExpression())); + QVERIFY(0 != p.signalExpression()); + + QCOMPARE(p.read(), QVariant()); + } + + // Deleted object + { + PropertyObject *o = new PropertyObject; + QmlMetaProperty p = QmlMetaProperty::createProperty(o, "rectProperty.x"); + QCOMPARE(p.read(), QVariant(10)); + delete o; + QCOMPARE(p.read(), QVariant()); + } +} + +void tst_qmlmetaproperty::write() +{ + // Invalid + { + QmlMetaProperty p; + QCOMPARE(p.write(QVariant(10)), false); + } + + // Read-only default prop + { + PropertyObject o; + QmlMetaProperty p(&o); + QCOMPARE(p.write(QVariant(10)), false); + } + + // Invalid default prop + { + QObject o; + QmlMetaProperty p(&o); + QCOMPARE(p.write(QVariant(10)), false); + } + + // Read-only prop by name + { + PropertyObject o; + QmlMetaProperty p(&o, QString("defaultProperty")); + QCOMPARE(p.write(QVariant(10)), false); + } + + // Writable prop by name + { + PropertyObject o; + QmlMetaProperty p(&o, QString("objectName")); + QCOMPARE(o.objectName(), QString()); + QCOMPARE(p.write(QVariant(QString("myName"))), true); + QCOMPARE(o.objectName(), QString("myName")); + } + + // Deleted object + { + PropertyObject *o = new PropertyObject; + QmlMetaProperty p(o, QString("objectName")); + QCOMPARE(p.write(QVariant(QString("myName"))), true); + QCOMPARE(o->objectName(), QString("myName")); + + delete o; + + QCOMPARE(p.write(QVariant(QString("myName"))), false); + } + + // Signal property + { + PropertyObject o; + QmlMetaProperty p(&o, "onClicked"); + QCOMPARE(p.write(QVariant("print(1921)")), false); + + QVERIFY(0 == p.setSignalExpression(new QmlExpression())); + QVERIFY(0 != p.signalExpression()); + + QCOMPARE(p.write(QVariant("print(1921)")), false); + + QVERIFY(0 != p.signalExpression()); + } + + // Value-type property + { + PropertyObject o; + QmlMetaProperty p(&o, "wrectProperty"); + + QCOMPARE(o.wrectProperty(), QRect()); + QCOMPARE(p.write(QRect(1, 13, 99, 8)), true); + QCOMPARE(o.wrectProperty(), QRect(1, 13, 99, 8)); + + QmlMetaProperty p2 = QmlMetaProperty::createProperty(&o, "wrectProperty.x"); + QCOMPARE(p2.read(), QVariant(1)); + QCOMPARE(p2.write(QVariant(6)), true); + QCOMPARE(p2.read(), QVariant(6)); + QCOMPARE(o.wrectProperty(), QRect(6, 13, 99, 8)); + } + + // URL-property + { + PropertyObject o; + QmlMetaProperty p(&o, "url"); + + QCOMPARE(p.write(QUrl("main.qml")), true); + QCOMPARE(o.url(), QUrl("main.qml")); + + QmlMetaProperty p2(&o, "url", engine.rootContext()); + + QUrl result = engine.baseUrl().resolved(QUrl("main.qml")); + QVERIFY(result != QUrl("main.qml")); + + QCOMPARE(p2.write(QUrl("main.qml")), true); + QCOMPARE(o.url(), result); + } +} + +void tst_qmlmetaproperty::writeObjectToList() { QmlComponent containerComponent(&engine, "import Test 1.0\nMyContainer { children: MyQmlObject {} }", QUrl()); MyContainer *container = qobject_cast(containerComponent.create()); @@ -105,7 +913,7 @@ void tst_QmlMetaProperty::writeObjectToList() } Q_DECLARE_METATYPE(QList); -void tst_QmlMetaProperty::writeListToList() +void tst_qmlmetaproperty::writeListToList() { QmlComponent containerComponent(&engine, "import Test 1.0\nMyContainer { children: MyQmlObject {} }", QUrl()); MyContainer *container = qobject_cast(containerComponent.create()); @@ -125,7 +933,7 @@ void tst_QmlMetaProperty::writeListToList() QCOMPARE(container->children()->size(), 1);*/ } -void tst_QmlMetaProperty::writeObjectToQmlList() +void tst_qmlmetaproperty::writeObjectToQmlList() { QmlComponent containerComponent(&engine, "import Test 1.0\nMyContainer { qmlChildren: MyQmlObject {} }", QUrl()); MyContainer *container = qobject_cast(containerComponent.create()); @@ -139,6 +947,6 @@ void tst_QmlMetaProperty::writeObjectToQmlList() QCOMPARE(container->qmlChildren()->at(1), object); } -QTEST_MAIN(tst_QmlMetaProperty) +QTEST_MAIN(tst_qmlmetaproperty) #include "tst_qmlmetaproperty.moc" -- cgit v0.12 From 578b31d7c95f9de3a6cfe699d78ff401c708aeee Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Wed, 4 Nov 2009 17:09:33 +1000 Subject: Update visual tests (mae fixed line spacing) --- .../visual/focusscope/data-X11/test.0.png | Bin 11521 -> 11501 bytes .../visual/focusscope/data-X11/test.1.png | Bin 11521 -> 11501 bytes .../visual/focusscope/data-X11/test.2.png | Bin 11503 -> 11486 bytes .../visual/focusscope/data-X11/test.3.png | Bin 11518 -> 11500 bytes .../visual/focusscope/data-X11/test.4.png | Bin 11518 -> 11500 bytes .../visual/focusscope/data-X11/test.5.png | Bin 11518 -> 11500 bytes .../visual/focusscope/data-X11/test.qml | 726 +++++------ .../visual/focusscope/data-X11/test3.0.png | Bin 10098 -> 10093 bytes .../visual/focusscope/data-X11/test3.1.png | Bin 10056 -> 10051 bytes .../visual/focusscope/data-X11/test3.2.png | Bin 9817 -> 9812 bytes .../visual/focusscope/data-X11/test3.3.png | Bin 9631 -> 9625 bytes .../visual/focusscope/data-X11/test3.4.png | Bin 9464 -> 9458 bytes .../visual/focusscope/data-X11/test3.5.png | Bin 9638 -> 9645 bytes .../visual/focusscope/data-X11/test3.6.png | Bin 9817 -> 9812 bytes .../visual/focusscope/data-X11/test3.7.png | Bin 10056 -> 10051 bytes .../visual/focusscope/data-X11/test3.8.png | Bin 10095 -> 10087 bytes .../visual/focusscope/data-X11/test3.9.png | Bin 10077 -> 10072 bytes .../visual/focusscope/data-X11/test3.qml | 1286 ++++++++++---------- tests/auto/declarative/visual/focusscope/test3.qml | 2 +- .../visual/qfxtext/elide/data-X11/elide.0.png | Bin 1012 -> 1002 bytes .../visual/qfxtext/elide/data-X11/elide.qml | 132 +- .../qfxtext/elide/data-X11/multilength.0.png | Bin 596 -> 596 bytes .../visual/qfxtext/elide/data-X11/multilength.qml | 146 +-- .../qfxwebview/autosize/data-X11/autosize.0.png | Bin 0 -> 6886 bytes .../qfxwebview/autosize/data-X11/autosize.qml | 83 ++ .../auto/declarative/visual/rect/GradientRect.qml | 6 +- tests/auto/declarative/visual/rect/MyRect.qml | 6 +- .../visual/rect/data-X11/rect-painting.0.png | Bin 0 -> 31355 bytes .../visual/rect/data-X11/rect-painting.qml | 355 ++++++ 29 files changed, 1590 insertions(+), 1152 deletions(-) create mode 100644 tests/auto/declarative/visual/qfxwebview/autosize/data-X11/autosize.0.png create mode 100644 tests/auto/declarative/visual/qfxwebview/autosize/data-X11/autosize.qml create mode 100644 tests/auto/declarative/visual/rect/data-X11/rect-painting.0.png create mode 100644 tests/auto/declarative/visual/rect/data-X11/rect-painting.qml diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test.0.png b/tests/auto/declarative/visual/focusscope/data-X11/test.0.png index d0fb8a0..f68f7dc 100644 Binary files a/tests/auto/declarative/visual/focusscope/data-X11/test.0.png and b/tests/auto/declarative/visual/focusscope/data-X11/test.0.png differ diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test.1.png b/tests/auto/declarative/visual/focusscope/data-X11/test.1.png index d0fb8a0..f68f7dc 100644 Binary files a/tests/auto/declarative/visual/focusscope/data-X11/test.1.png and b/tests/auto/declarative/visual/focusscope/data-X11/test.1.png differ diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test.2.png b/tests/auto/declarative/visual/focusscope/data-X11/test.2.png index f25f27c..e26c028 100644 Binary files a/tests/auto/declarative/visual/focusscope/data-X11/test.2.png and b/tests/auto/declarative/visual/focusscope/data-X11/test.2.png differ diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test.3.png b/tests/auto/declarative/visual/focusscope/data-X11/test.3.png index 74a9b3f..9c4b2f2 100644 Binary files a/tests/auto/declarative/visual/focusscope/data-X11/test.3.png and b/tests/auto/declarative/visual/focusscope/data-X11/test.3.png differ diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test.4.png b/tests/auto/declarative/visual/focusscope/data-X11/test.4.png index 74a9b3f..9c4b2f2 100644 Binary files a/tests/auto/declarative/visual/focusscope/data-X11/test.4.png and b/tests/auto/declarative/visual/focusscope/data-X11/test.4.png differ diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test.5.png b/tests/auto/declarative/visual/focusscope/data-X11/test.5.png index 74a9b3f..9c4b2f2 100644 Binary files a/tests/auto/declarative/visual/focusscope/data-X11/test.5.png and b/tests/auto/declarative/visual/focusscope/data-X11/test.5.png differ diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test.qml b/tests/auto/declarative/visual/focusscope/data-X11/test.qml index 5c66034..93189fa 100644 --- a/tests/auto/declarative/visual/focusscope/data-X11/test.qml +++ b/tests/auto/declarative/visual/focusscope/data-X11/test.qml @@ -6,239 +6,239 @@ VisualTest { } Frame { msec: 16 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 32 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 48 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 64 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 80 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 96 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 112 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 128 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 144 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 160 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 176 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 192 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 208 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 224 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 240 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 256 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 272 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 288 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 304 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 320 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 336 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 352 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 368 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 384 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 400 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 416 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 432 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 448 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 464 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 480 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 496 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 512 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 528 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 544 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 560 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 576 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 592 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 608 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 624 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 640 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 656 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 672 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 688 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 704 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 720 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 736 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 752 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 768 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 784 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 800 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 816 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 832 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 848 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 864 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 880 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 896 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 912 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 928 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 944 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 960 @@ -246,75 +246,75 @@ VisualTest { } Frame { msec: 976 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 992 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1008 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1024 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1040 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1056 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1072 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1088 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1104 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1120 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1136 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1152 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1168 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1184 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1200 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1216 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1232 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1248 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Key { type: 6 @@ -326,23 +326,23 @@ VisualTest { } Frame { msec: 1264 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1280 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1296 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1312 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1328 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Key { type: 7 @@ -354,123 +354,123 @@ VisualTest { } Frame { msec: 1344 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1360 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1376 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1392 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1408 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1424 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1440 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1456 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1472 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1488 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1504 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1520 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1536 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1552 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1568 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1584 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1600 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1616 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1632 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1648 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1664 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1680 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1696 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1712 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1728 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1744 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1760 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1776 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1792 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 1808 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Key { type: 6 @@ -482,27 +482,27 @@ VisualTest { } Frame { msec: 1824 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1840 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1856 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1872 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1888 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1904 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1920 @@ -510,11 +510,11 @@ VisualTest { } Frame { msec: 1936 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1952 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Key { type: 7 @@ -526,103 +526,103 @@ VisualTest { } Frame { msec: 1968 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 1984 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2000 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2016 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2032 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2048 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2064 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2080 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2096 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2112 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2128 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2144 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2160 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2176 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2192 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2208 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2224 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2240 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2256 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2272 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2288 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2304 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2320 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2336 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 2352 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Key { type: 6 @@ -634,31 +634,31 @@ VisualTest { } Frame { msec: 2368 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2384 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2400 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2416 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2432 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2448 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2464 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Key { type: 7 @@ -670,103 +670,103 @@ VisualTest { } Frame { msec: 2480 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2496 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2512 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2528 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2544 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2560 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2576 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2592 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2608 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2624 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2640 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2656 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2672 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2688 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2704 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2720 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2736 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2752 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2768 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2784 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2800 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2816 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2832 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2848 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2864 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2880 @@ -774,27 +774,27 @@ VisualTest { } Frame { msec: 2896 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2912 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2928 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2944 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2960 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 2976 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Key { type: 6 @@ -806,31 +806,31 @@ VisualTest { } Frame { msec: 2992 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3008 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3024 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3040 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3056 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3072 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3088 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Key { type: 7 @@ -842,115 +842,115 @@ VisualTest { } Frame { msec: 3104 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3120 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3136 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3152 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3168 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3184 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3200 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3216 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3232 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3248 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3264 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3280 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3296 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3312 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3328 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3344 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3360 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3376 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3392 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3408 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3424 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3440 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3456 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3472 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3488 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3504 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3520 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Frame { msec: 3536 - hash: "e608f3483071562580bf492da25a4104" + hash: "cd2aced96da9032ddd5e2cacf27d045d" } Key { type: 6 @@ -962,31 +962,31 @@ VisualTest { } Frame { msec: 3552 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3568 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3584 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3600 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3616 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3632 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3648 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Key { type: 7 @@ -998,47 +998,47 @@ VisualTest { } Frame { msec: 3664 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3680 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3696 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3712 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3728 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3744 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3760 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3776 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3792 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3808 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3824 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3840 @@ -1046,87 +1046,87 @@ VisualTest { } Frame { msec: 3856 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3872 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3888 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3904 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3920 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3936 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3952 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3968 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 3984 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4000 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4016 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4032 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4048 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4064 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4080 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4096 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4112 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4128 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4144 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4160 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4176 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Key { type: 6 @@ -1138,27 +1138,27 @@ VisualTest { } Frame { msec: 4192 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4208 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4224 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4240 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4256 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4272 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Key { type: 7 @@ -1170,131 +1170,131 @@ VisualTest { } Frame { msec: 4288 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4304 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4320 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4336 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4352 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4368 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4384 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4400 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4416 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4432 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4448 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4464 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4480 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4496 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4512 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4528 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4544 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4560 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4576 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4592 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4608 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4624 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4640 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4656 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4672 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4688 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4704 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4720 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4736 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4752 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4768 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Frame { msec: 4784 - hash: "231a20ad55d5ba3be9baf46a80ec86f4" + hash: "9157e592069482e801a091aa69758d26" } Key { type: 6 @@ -1310,27 +1310,27 @@ VisualTest { } Frame { msec: 4816 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4832 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4848 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4864 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4880 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4896 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Key { type: 7 @@ -1342,215 +1342,215 @@ VisualTest { } Frame { msec: 4912 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4928 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4944 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4960 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4976 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 4992 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5008 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5024 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5040 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5056 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5072 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5088 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5104 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5120 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5136 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5152 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5168 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5184 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5200 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5216 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5232 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5248 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5264 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5280 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5296 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5312 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5328 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5344 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5360 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5376 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5392 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5408 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5424 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5440 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5456 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5472 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5488 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5504 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5520 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5536 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5552 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5568 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5584 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5600 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5616 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5632 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5648 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5664 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5680 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5696 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5712 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5728 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5744 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5760 @@ -1558,42 +1558,42 @@ VisualTest { } Frame { msec: 5776 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5792 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Key { type: 6 key: 16777249 - modifiers: 0 + modifiers: 67108864 text: "" autorep: false count: 1 } Frame { msec: 5808 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5824 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5840 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5856 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5872 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } Frame { msec: 5888 - hash: "383edfe8be8621d456162cc1cd88ae1a" + hash: "0de58b2460574baf17912e90ba8a89b2" } } diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.0.png b/tests/auto/declarative/visual/focusscope/data-X11/test3.0.png index 2821112..5f93c67 100644 Binary files a/tests/auto/declarative/visual/focusscope/data-X11/test3.0.png and b/tests/auto/declarative/visual/focusscope/data-X11/test3.0.png differ diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.1.png b/tests/auto/declarative/visual/focusscope/data-X11/test3.1.png index d3aeb93..3b4e0e6 100644 Binary files a/tests/auto/declarative/visual/focusscope/data-X11/test3.1.png and b/tests/auto/declarative/visual/focusscope/data-X11/test3.1.png differ diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.2.png b/tests/auto/declarative/visual/focusscope/data-X11/test3.2.png index d7b647f..54a3934 100644 Binary files a/tests/auto/declarative/visual/focusscope/data-X11/test3.2.png and b/tests/auto/declarative/visual/focusscope/data-X11/test3.2.png differ diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.3.png b/tests/auto/declarative/visual/focusscope/data-X11/test3.3.png index 551efc8..4f08fd2 100644 Binary files a/tests/auto/declarative/visual/focusscope/data-X11/test3.3.png and b/tests/auto/declarative/visual/focusscope/data-X11/test3.3.png differ diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.4.png b/tests/auto/declarative/visual/focusscope/data-X11/test3.4.png index 5e59cbe..9aee1f8 100644 Binary files a/tests/auto/declarative/visual/focusscope/data-X11/test3.4.png and b/tests/auto/declarative/visual/focusscope/data-X11/test3.4.png differ diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.5.png b/tests/auto/declarative/visual/focusscope/data-X11/test3.5.png index 622c768..04eb05c 100644 Binary files a/tests/auto/declarative/visual/focusscope/data-X11/test3.5.png and b/tests/auto/declarative/visual/focusscope/data-X11/test3.5.png differ diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.6.png b/tests/auto/declarative/visual/focusscope/data-X11/test3.6.png index d7b647f..54a3934 100644 Binary files a/tests/auto/declarative/visual/focusscope/data-X11/test3.6.png and b/tests/auto/declarative/visual/focusscope/data-X11/test3.6.png differ diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.7.png b/tests/auto/declarative/visual/focusscope/data-X11/test3.7.png index d3aeb93..3b4e0e6 100644 Binary files a/tests/auto/declarative/visual/focusscope/data-X11/test3.7.png and b/tests/auto/declarative/visual/focusscope/data-X11/test3.7.png differ diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.8.png b/tests/auto/declarative/visual/focusscope/data-X11/test3.8.png index 891a10a..2df55df 100644 Binary files a/tests/auto/declarative/visual/focusscope/data-X11/test3.8.png and b/tests/auto/declarative/visual/focusscope/data-X11/test3.8.png differ diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.9.png b/tests/auto/declarative/visual/focusscope/data-X11/test3.9.png index c346260..91816fd 100644 Binary files a/tests/auto/declarative/visual/focusscope/data-X11/test3.9.png and b/tests/auto/declarative/visual/focusscope/data-X11/test3.9.png differ diff --git a/tests/auto/declarative/visual/focusscope/data-X11/test3.qml b/tests/auto/declarative/visual/focusscope/data-X11/test3.qml index e7cb67c..b1f628f 100644 --- a/tests/auto/declarative/visual/focusscope/data-X11/test3.qml +++ b/tests/auto/declarative/visual/focusscope/data-X11/test3.qml @@ -6,151 +6,151 @@ VisualTest { } Frame { msec: 16 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 32 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 48 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 64 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 80 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 96 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 112 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 128 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 144 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 160 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 176 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 192 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 208 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 224 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 240 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 256 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 272 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 288 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 304 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 320 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 336 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 352 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 368 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 384 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 400 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 416 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 432 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 448 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 464 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 480 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 496 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 512 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 528 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 544 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 560 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 576 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 592 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Key { type: 6 @@ -162,27 +162,27 @@ VisualTest { } Frame { msec: 608 - hash: "70404a8e19cee8dad4a7dc16b3b018e2" + hash: "ed71dfbe146870d1a0869d60c35ff9d7" } Frame { msec: 624 - hash: "70404a8e19cee8dad4a7dc16b3b018e2" + hash: "ed71dfbe146870d1a0869d60c35ff9d7" } Frame { msec: 640 - hash: "42ede0774612c5ce72bcb17c1f8c53fb" + hash: "34796cef9feb92f7f0e2e8d837d87d34" } Frame { msec: 656 - hash: "acbf5d05e87e456b49636a8e533b8819" + hash: "64fa8f195b57077aa03ca264fec9554a" } Frame { msec: 672 - hash: "1c3adf6475d5bbf23c83dda77614834f" + hash: "ae33318904415e937363787273ecb566" } Frame { msec: 688 - hash: "b047088d7d135614c7de5d6b1fe6447c" + hash: "67c3e1c8c728e7677a3554aadd9795c9" } Key { type: 7 @@ -194,67 +194,67 @@ VisualTest { } Frame { msec: 704 - hash: "59393e79f5571c1b0b54ceb96c570afd" + hash: "1857db7aa9eefe429d50e5b2ad87064b" } Frame { msec: 720 - hash: "2657a9db93dab4180ddf5a3d928fa83c" + hash: "507883a03bef0bc20755da1474731fdf" } Frame { msec: 736 - hash: "bd012a5b982553780ef81ea273381988" + hash: "dafe7464394460e04d482c1f7a1e9ad0" } Frame { msec: 752 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 768 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 784 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 800 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 816 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 832 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 848 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 864 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 880 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 896 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 912 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 928 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 944 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 960 @@ -262,35 +262,35 @@ VisualTest { } Frame { msec: 976 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 992 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 1008 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 1024 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 1040 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 1056 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 1072 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 1088 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Key { type: 6 @@ -302,35 +302,35 @@ VisualTest { } Frame { msec: 1104 - hash: "3ba7daa96383cc7fcd2f3e15b9b46bea" + hash: "7fb8cb07b6bca30912706cec43984d92" } Frame { msec: 1120 - hash: "3ba7daa96383cc7fcd2f3e15b9b46bea" + hash: "7fb8cb07b6bca30912706cec43984d92" } Frame { msec: 1136 - hash: "c097e88ae5cea1203735aba2de753b35" + hash: "c1915978cda982f6062790b2a583211b" } Frame { msec: 1152 - hash: "309058119191341625c797e14b1d68fd" + hash: "afdb50d740b3dc7be44021d826be4302" } Frame { msec: 1168 - hash: "d2d44135892d56e556b6343e0d2177df" + hash: "4682717b9375b4b02a70378ddca30885" } Frame { msec: 1184 - hash: "8f77166dfb871d1ad3c4b21e9626dcf8" + hash: "aede0eebb3948a4a764e255b892b09be" } Frame { msec: 1200 - hash: "b6bd7476decc62d295414eea18f21ffb" + hash: "b42a147daec14a3da2548fd4de3a9a44" } Frame { msec: 1216 - hash: "8ca06a6b2787a3e684b6a0614baf057f" + hash: "2ff70f916f78fe3c199eb96ceb44ce4e" } Key { type: 7 @@ -342,79 +342,79 @@ VisualTest { } Frame { msec: 1232 - hash: "119130d0bde37eb6038e4fbcea54d619" + hash: "707ac8e58d317b97113903b45a482f6b" } Frame { msec: 1248 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 1264 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 1280 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 1296 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 1312 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 1328 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 1344 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 1360 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 1376 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 1392 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 1408 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 1424 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 1440 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 1456 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 1472 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 1488 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 1504 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 1520 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Key { type: 6 @@ -426,35 +426,35 @@ VisualTest { } Frame { msec: 1536 - hash: "d36e8e689b999046f5671cce03ec98b9" + hash: "91525556fe23764f58b3a3f38a29cd76" } Frame { msec: 1552 - hash: "d36e8e689b999046f5671cce03ec98b9" + hash: "91525556fe23764f58b3a3f38a29cd76" } Frame { msec: 1568 - hash: "1ae470df65b1637dfed5ed330bf6f2cc" + hash: "d1dc625bbf46fc51aaf47969ad27a8a4" } Frame { msec: 1584 - hash: "fd98bff5f8c97cf0644aca6d205720b3" + hash: "7d868176c7a8363a79ef8b8f4da56867" } Frame { msec: 1600 - hash: "6c97607356ec22d77da6170de94ed1b8" + hash: "d239e0b0e118d351680c6b4b2bc5d3b2" } Frame { msec: 1616 - hash: "ee49691989ffada50e3b82df960ec1cb" + hash: "8f6d1640dbc655eb3b326c66fcb97d3c" } Frame { msec: 1632 - hash: "fba046a966f5ebdc17a73c33fb2fb1af" + hash: "d52b623b8449d71734f72c7bd661a1c4" } Frame { msec: 1648 - hash: "5031c1c466e14e7daf39be6af1a9c402" + hash: "f7c0c77f3b5ed71321edd6bc7b605512" } Key { type: 7 @@ -466,67 +466,67 @@ VisualTest { } Frame { msec: 1664 - hash: "508c31a76bbb9ae50ec44484ea889289" + hash: "8b26397ff1a83baa894f82594a12a190" } Frame { msec: 1680 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 1696 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 1712 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 1728 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 1744 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 1760 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 1776 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 1792 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 1808 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 1824 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 1840 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 1856 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 1872 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 1888 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 1904 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 1920 @@ -534,23 +534,23 @@ VisualTest { } Frame { msec: 1936 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 1952 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 1968 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 1984 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 2000 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Key { type: 6 @@ -562,35 +562,35 @@ VisualTest { } Frame { msec: 2016 - hash: "c79134dc4b03885c0c2139e9f1949968" + hash: "f63308a7cd48a8cb4d413d17120f5a26" } Frame { msec: 2032 - hash: "c79134dc4b03885c0c2139e9f1949968" + hash: "f63308a7cd48a8cb4d413d17120f5a26" } Frame { msec: 2048 - hash: "6f29381e25034bcb9177033fdaf1ee4c" + hash: "2e97db8ed93524dc197e76cc2d270999" } Frame { msec: 2064 - hash: "e9668338280735ed6cf1e71f02d28f04" + hash: "2b135d90684c0f94b8219c4b835b6da9" } Frame { msec: 2080 - hash: "ecd5a887981d564c6e40c215ebb867d2" + hash: "c700a76932bb3bf72868b9e95d095db2" } Frame { msec: 2096 - hash: "0960f7192633036319aa3500dbf38d2b" + hash: "08136d3c3de44ddab23d2d136ba1f310" } Frame { msec: 2112 - hash: "22ececdfdd7eb5a8999df153de47c2e6" + hash: "de701d641e004b61a3c0609556f52fe0" } Frame { msec: 2128 - hash: "f77abe52bd76bca4b728415c4dfd52dc" + hash: "4f7acd87f4de119ad88a53d2c9881037" } Key { type: 7 @@ -602,99 +602,99 @@ VisualTest { } Frame { msec: 2144 - hash: "6d19c9df56ed8037dd5a123945b6fea0" + hash: "deaf3c8a4680ef6f52cb4674a97e0767" } Frame { msec: 2160 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2176 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2192 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2208 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2224 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2240 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2256 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2272 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2288 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2304 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2320 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2336 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2352 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2368 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2384 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2400 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2416 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2432 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2448 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2464 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2480 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2496 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 2512 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Key { type: 6 @@ -706,27 +706,27 @@ VisualTest { } Frame { msec: 2528 - hash: "3e0fa3d0d36a4ea51e9e89933d91e58a" + hash: "fe67b3a48a8a074377be64f619d5922a" } Frame { msec: 2544 - hash: "3e0fa3d0d36a4ea51e9e89933d91e58a" + hash: "fe67b3a48a8a074377be64f619d5922a" } Frame { msec: 2560 - hash: "eea826901b19fb3c7aff8594d8030acb" + hash: "088691f4f46f7a8c9a3b8ea766d9a437" } Frame { msec: 2576 - hash: "a673c5dbc0b1b7bf585319a923db6478" + hash: "bd747ea04c3b36378374f8ea1031458f" } Frame { msec: 2592 - hash: "c9fa9bdb8c8ad8c1144feb4a7f9ae96e" + hash: "2ebd0e3373eb75a3ad986e203952f78a" } Frame { msec: 2608 - hash: "646601d0aabe76467c3317fb12e785e5" + hash: "b4d89e4f3aef9f351facd13bd83f3022" } Key { type: 7 @@ -738,67 +738,67 @@ VisualTest { } Frame { msec: 2624 - hash: "a88500a959cd4127528a74af4979d83a" + hash: "091de1bd1719e1fa6d914cf9708f4ac6" } Frame { msec: 2640 - hash: "ab288556e0bff85a48be364ee7a61b18" + hash: "0097d8ed156cb0c78c48dfacc557cba8" } Frame { msec: 2656 - hash: "db5d053fd16f3bd6e3048f1d7f123027" + hash: "faeb379e01283cb21ea695e96727918d" } Frame { msec: 2672 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 2688 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 2704 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 2720 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 2736 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 2752 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 2768 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 2784 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 2800 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 2816 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 2832 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 2848 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 2864 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 2880 @@ -806,27 +806,27 @@ VisualTest { } Frame { msec: 2896 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 2912 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 2928 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 2944 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 2960 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 2976 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Key { type: 6 @@ -838,39 +838,39 @@ VisualTest { } Frame { msec: 2992 - hash: "dfc6df49c4340429529e88e877940158" + hash: "b00a29d67edc26e75f5298b2836d4e47" } Frame { msec: 3008 - hash: "dfc6df49c4340429529e88e877940158" + hash: "b00a29d67edc26e75f5298b2836d4e47" } Frame { msec: 3024 - hash: "e44644da7159bfde1a1cf6148d268c53" + hash: "6e47c87b5063877a609e8d23ddf2d314" } Frame { msec: 3040 - hash: "f0045733c7f4e799c4ca49ec28c7c652" + hash: "06f147a69c3e903905376ef1229290bf" } Frame { msec: 3056 - hash: "8b0ded24c343556849ea67d191c03a17" + hash: "5f02ff1a1207f17efd224ccc800b0057" } Frame { msec: 3072 - hash: "0c50a579850c3eb43c4824bf7e8b1d12" + hash: "6c0860fdb216bb79fd2da4647792628d" } Frame { msec: 3088 - hash: "747d2205db14cf72dc5989e92b8076ab" + hash: "eb579f67620adb762722428d44a1d841" } Frame { msec: 3104 - hash: "a0a9196cb896eadf411cbcccaa069f10" + hash: "c579017a82e34a471a95f8a116a20b9e" } Frame { msec: 3120 - hash: "c682ad7747f7245b4e213fc078d51e8f" + hash: "bb5c08ff104b230829579dfb8015bdcc" } Key { type: 7 @@ -882,95 +882,95 @@ VisualTest { } Frame { msec: 3136 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3152 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3168 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3184 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3200 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3216 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3232 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3248 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3264 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3280 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3296 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3312 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3328 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3344 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3360 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3376 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3392 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3408 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3424 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3440 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3456 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3472 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 3488 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Key { type: 6 @@ -982,35 +982,35 @@ VisualTest { } Frame { msec: 3504 - hash: "115b81c715a58e66c3d1f09bb03fe97f" + hash: "5aa664f268433f2724a1ab2cea1d6d25" } Frame { msec: 3520 - hash: "115b81c715a58e66c3d1f09bb03fe97f" + hash: "5aa664f268433f2724a1ab2cea1d6d25" } Frame { msec: 3536 - hash: "a994e45c41afe0a4ab7d65c27139f3d8" + hash: "9e4854fd0c533efa75aec7d9a8bc41dd" } Frame { msec: 3552 - hash: "b02ecf8c3413752aa1d2bfa6e08184ca" + hash: "c4eee4eca804007dca6e6d9379cbfb1b" } Frame { msec: 3568 - hash: "85ef0bedcb66676ca658068561d8df8e" + hash: "c59774f00d54c0353b41202a39fc0dbd" } Frame { msec: 3584 - hash: "435bce6119a6542ce9ad743baa70ceb0" + hash: "910e6b5b05530c60874eee00df0d62cf" } Frame { msec: 3600 - hash: "5918c9c068ca62795d7b97ac818d79d5" + hash: "5b606a7a697c6d53fbe42e33333f96cc" } Frame { msec: 3616 - hash: "ff3ebc0c6f7eb39bbc10fad07b671d82" + hash: "e1fce42312e8a31d74add4a447dd3df9" } Key { type: 7 @@ -1022,55 +1022,55 @@ VisualTest { } Frame { msec: 3632 - hash: "0426b9666ccd84aa0d095e47a9379bd7" + hash: "6250cb9ea51309922cf0a6647593bfee" } Frame { msec: 3648 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 3664 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 3680 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 3696 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 3712 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 3728 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 3744 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 3760 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 3776 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 3792 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 3808 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 3824 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 3840 @@ -1078,39 +1078,39 @@ VisualTest { } Frame { msec: 3856 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 3872 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 3888 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 3904 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 3920 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 3936 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 3952 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 3968 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 3984 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Key { type: 6 @@ -1122,35 +1122,35 @@ VisualTest { } Frame { msec: 4000 - hash: "30901e72d40975b92c9d96c0f52b458c" + hash: "d6eecfb695deacae4bb2fe5adb2d5c3d" } Frame { msec: 4016 - hash: "30901e72d40975b92c9d96c0f52b458c" + hash: "d6eecfb695deacae4bb2fe5adb2d5c3d" } Frame { msec: 4032 - hash: "f4f84cb8e42e269b121b2ffa9204db38" + hash: "b48f481a8149c03139e29b619dbb3f3c" } Frame { msec: 4048 - hash: "41e9198277d0d590d176fd9972bfbf58" + hash: "994ba7fc208bbf081d54384d82d0fc07" } Frame { msec: 4064 - hash: "664bddf12068363afc89f8fc52d133c0" + hash: "05d30293c12eb6a3e21cebd42bb1f383" } Frame { msec: 4080 - hash: "18a12504f09551bd6e3013ef1bbf40f9" + hash: "f2b4140a5d26f241a27e2a3027785559" } Frame { msec: 4096 - hash: "95717e24255e442d955d3c64691576e0" + hash: "1189e519fd1611c5603e598fbcadca44" } Frame { msec: 4112 - hash: "7cb9b9a71bfb1cd3061efde86e57ff34" + hash: "ee98893d95e55cb76966c0cfe29d237b" } Key { type: 7 @@ -1162,171 +1162,171 @@ VisualTest { } Frame { msec: 4128 - hash: "a090d2c37080361240769198f1032b7a" + hash: "9ff3010efeb8707c864def782405ad4c" } Frame { msec: 4144 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4160 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4176 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4192 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4208 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4224 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4240 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4256 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4272 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4288 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4304 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4320 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4336 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4352 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4368 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4384 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4400 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4416 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4432 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4448 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4464 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4480 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4496 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4512 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4528 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4544 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4560 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4576 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4592 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4608 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4624 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4640 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4656 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4672 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4688 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4704 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4720 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4736 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4752 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4768 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4784 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4800 @@ -1334,79 +1334,79 @@ VisualTest { } Frame { msec: 4816 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4832 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4848 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4864 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4880 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4896 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4912 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4928 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4944 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4960 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4976 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 4992 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 5008 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 5024 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 5040 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 5056 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 5072 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 5088 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Frame { msec: 5104 - hash: "c37a8dc01901eb4a1fb0d6ac3c91fca0" + hash: "c842d544f87332bc133833e8966240ee" } Key { type: 6 @@ -1418,35 +1418,35 @@ VisualTest { } Frame { msec: 5120 - hash: "0a524f53903aa1651152fd4a6068c14c" + hash: "a857238777462319fcedd4f359ce1a04" } Frame { msec: 5136 - hash: "0a524f53903aa1651152fd4a6068c14c" + hash: "a857238777462319fcedd4f359ce1a04" } Frame { msec: 5152 - hash: "bbef86b80161702653b88f6cfa88528c" + hash: "d9248d1257bf0232dcdf29fca7536ad1" } Frame { msec: 5168 - hash: "26de302dde8fb22e509c0b3c8cb37abd" + hash: "0405e029cc4b2fa80761c06fb8898b0d" } Frame { msec: 5184 - hash: "9f3ec01bf5ae12383a58a716d462d479" + hash: "a36fb7e32e6aafbb84b62ef56be3cf70" } Frame { msec: 5200 - hash: "cbfa90ccd871ba1ab12f75e8e5f2e11e" + hash: "9846c73bbe57277bd36bbca1c489e644" } Frame { msec: 5216 - hash: "c5ba4fd178429a1cb44ec96da8a1a404" + hash: "8f4840715082c48d520ddb55501cf8eb" } Frame { msec: 5232 - hash: "fb87133ef012abe68491be1cc627d580" + hash: "478fde3a6fd8cecc222b8c16743d231f" } Key { type: 7 @@ -1458,123 +1458,123 @@ VisualTest { } Frame { msec: 5248 - hash: "0f8147bf9cd92eec88ea6f8b9f2ad5eb" + hash: "b2bb760c93d26c6db21ce6beccd36b66" } Frame { msec: 5264 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5280 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5296 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5312 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5328 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5344 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5360 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5376 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5392 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5408 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5424 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5440 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5456 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5472 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5488 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5504 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5520 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5536 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5552 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5568 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5584 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5600 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5616 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5632 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5648 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5664 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5680 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5696 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Frame { msec: 5712 - hash: "f2ca9897c874faa97f2d959964da4bd1" + hash: "1ef605e1a68ff993f4f971a85a6bee97" } Key { type: 6 @@ -1586,11 +1586,11 @@ VisualTest { } Frame { msec: 5728 - hash: "f78a62f7143dbf86e0b153fe08a9bf6e" + hash: "4780d8094833831f27d1aff3e0f9689f" } Frame { msec: 5744 - hash: "f78a62f7143dbf86e0b153fe08a9bf6e" + hash: "4780d8094833831f27d1aff3e0f9689f" } Frame { msec: 5760 @@ -1598,27 +1598,27 @@ VisualTest { } Frame { msec: 5776 - hash: "e89f6d4727cf92ce87e4c48eb34074a6" + hash: "93c8d7980de378a055b7ca824882ae4e" } Frame { msec: 5792 - hash: "eb7761ac018dbb93b72acd3126a7eace" + hash: "e0abe402f89c5d84e5a02f0e4bcbd5e3" } Frame { msec: 5808 - hash: "a70638789eeaada677afa68a7dcc1f97" + hash: "067ca20bcfab459a28af7e8dc2830032" } Frame { msec: 5824 - hash: "bb709f17058d1f41b34831d1055195cc" + hash: "d27dc1a08c66cf5f4a84efe3be522ec3" } Frame { msec: 5840 - hash: "3b459f10eb299712180fed277c75ca22" + hash: "639f7555adc7958e807c2e774694fe25" } Frame { msec: 5856 - hash: "8f77a04a3690f7cbfae4858c8fff1a24" + hash: "b55f5fcbc2284736695049b2cdc9c8ce" } Key { type: 7 @@ -1630,107 +1630,107 @@ VisualTest { } Frame { msec: 5872 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 5888 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 5904 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 5920 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 5936 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 5952 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 5968 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 5984 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 6000 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 6016 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 6032 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 6048 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 6064 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 6080 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 6096 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 6112 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 6128 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 6144 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 6160 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 6176 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 6192 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 6208 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 6224 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 6240 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 6256 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Frame { msec: 6272 - hash: "0d20e56256c2aa305c487c7875249c45" + hash: "f209867bbf74dbe0385655a522e322f1" } Key { type: 6 @@ -1742,39 +1742,39 @@ VisualTest { } Frame { msec: 6288 - hash: "80a729efc25a86d09977f6abe4b96e77" + hash: "48910947dd160b33251c54ff45f6a0db" } Frame { msec: 6304 - hash: "80a729efc25a86d09977f6abe4b96e77" + hash: "48910947dd160b33251c54ff45f6a0db" } Frame { msec: 6320 - hash: "75e57461badc3fd9c38548c751a86b62" + hash: "20b0f988a1517d67a0d3c78ae8af4e5a" } Frame { msec: 6336 - hash: "b0f49c8a67bdf1285334514d78a6b613" + hash: "355b5b161176c31bcbae198b1581f59b" } Frame { msec: 6352 - hash: "564bca050cfc30f19b77989a1e3a26d8" + hash: "19cbb853a93bd062a53d7908df54bfbd" } Frame { msec: 6368 - hash: "caca4855c581f42b26623bf717302884" + hash: "13fbe723f288cffd09f0a86b71457161" } Frame { msec: 6384 - hash: "89db7709fcec729023c910608b504665" + hash: "0014ed3b1a868cf75bfffedb52674c5c" } Frame { msec: 6400 - hash: "5501f75f4b8b3229a7db38df4e9cc938" + hash: "a1c444be02b90e69319096b8a508947d" } Frame { msec: 6416 - hash: "505d12f5900fa920f47c650d24745ec5" + hash: "b88a3f2f3290e4262757b1f5741cb5ce" } Key { type: 7 @@ -1786,75 +1786,75 @@ VisualTest { } Frame { msec: 6432 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6448 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6464 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6480 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6496 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6512 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6528 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6544 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6560 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6576 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6592 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6608 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6624 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6640 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6656 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6672 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6688 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6704 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6720 @@ -1862,35 +1862,35 @@ VisualTest { } Frame { msec: 6736 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6752 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6768 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6784 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6800 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6816 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6832 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Frame { msec: 6848 - hash: "4e9b6719737e92ef409b76772a9d6b4a" + hash: "dc708a762ba7f1120eb14105571943f8" } Key { type: 6 @@ -1902,39 +1902,39 @@ VisualTest { } Frame { msec: 6864 - hash: "240f48d1c5aa1c23bf1c660a0a468283" + hash: "a44bb76233c69780c178dddd79cc1968" } Frame { msec: 6880 - hash: "240f48d1c5aa1c23bf1c660a0a468283" + hash: "a44bb76233c69780c178dddd79cc1968" } Frame { msec: 6896 - hash: "e1ba9a4edfd19acffdf25e51dbbc94a5" + hash: "154b11fd0468aa18d1ef1895f2e2923c" } Frame { msec: 6912 - hash: "e40877ef6876be3f44db947af54287bc" + hash: "fe7ecb02e63fbb7584405e7162f0ee21" } Frame { msec: 6928 - hash: "a72d66c4691d03e7b9a12df9df3d4b4d" + hash: "90b6fea69d106c628a9c7ff23a97e6c2" } Frame { msec: 6944 - hash: "26cda82027725475f2be660a8e8b2463" + hash: "3e233e837e24976d441b6cabc3b74098" } Frame { msec: 6960 - hash: "233e9b1c58cc338d22e3d3ca8669a33a" + hash: "7a490f7be5c4c0ae09421f884e9adadb" } Frame { msec: 6976 - hash: "316788ce1340cb0e151d12d244a48068" + hash: "462d44603dd661ccf126c81197608056" } Frame { msec: 6992 - hash: "6213c8fde998ae5b819f9e3f7f7ea857" + hash: "0b7ca73497c37255bccad6787d690236" } Key { type: 7 @@ -1946,115 +1946,115 @@ VisualTest { } Frame { msec: 7008 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7024 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7040 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7056 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7072 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7088 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7104 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7120 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7136 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7152 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7168 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7184 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7200 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7216 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7232 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7248 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7264 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7280 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7296 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7312 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7328 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7344 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7360 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7376 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7392 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7408 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7424 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Frame { msec: 7440 - hash: "316d165df776e906015714372e67f452" + hash: "224ade5c942415100b5418a11d043611" } Key { type: 6 @@ -2066,31 +2066,31 @@ VisualTest { } Frame { msec: 7456 - hash: "37bfd610be786be852b78bdb933b9a01" + hash: "95ff2a535a13fcdded94229d53848f7c" } Frame { msec: 7472 - hash: "37bfd610be786be852b78bdb933b9a01" + hash: "95ff2a535a13fcdded94229d53848f7c" } Frame { msec: 7488 - hash: "05b41d669cdb7821d3db181c444f9667" + hash: "d2386e4137632f15aa5ba9dd1a138a67" } Frame { msec: 7504 - hash: "2ddf3b590860a1db12d04ab4dde830a3" + hash: "9f2c40191c1a81f37543f5bfcb852bdf" } Frame { msec: 7520 - hash: "ecc85633bf413d41da38b87d21c92653" + hash: "5facdbcc9d7ab0adfcb2ca9d1812a3f5" } Frame { msec: 7536 - hash: "829b18a6568680d9fbf720926ec65954" + hash: "7bbb08470e4f3eeabe710e0ea327c467" } Frame { msec: 7552 - hash: "04f844fe5b2f944d435a9c66d93d2907" + hash: "630abf60d09d3a685d79e6da627b3aa2" } Key { type: 7 @@ -2102,31 +2102,31 @@ VisualTest { } Frame { msec: 7568 - hash: "49680fff1a16c74de135a72c6b13d156" + hash: "d8aed706508814cdbd1ef0984f112b94" } Frame { msec: 7584 - hash: "a4b4e3a49ce12e8a8a1a43a808555243" + hash: "d191c2dc3e2edd05bfd649dcfa51029e" } Frame { msec: 7600 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7616 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7632 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7648 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7664 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7680 @@ -2134,75 +2134,75 @@ VisualTest { } Frame { msec: 7696 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7712 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7728 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7744 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7760 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7776 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7792 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7808 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7824 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7840 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7856 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7872 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7888 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7904 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7920 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7936 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7952 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Frame { msec: 7968 - hash: "aa35e3c7afbb686aca85da5f4d3dc17b" + hash: "7ee37281a3f5788305f779bdd33852e5" } Key { type: 6 @@ -2214,39 +2214,39 @@ VisualTest { } Frame { msec: 7984 - hash: "0211b4e4fe18757e34bec35eab5fde3b" + hash: "fb386abfd73a3feb05b573d16ffa93f9" } Frame { msec: 8000 - hash: "0211b4e4fe18757e34bec35eab5fde3b" + hash: "fb386abfd73a3feb05b573d16ffa93f9" } Frame { msec: 8016 - hash: "abbd3f1a519e8f667b2eebe75c9b4cb3" + hash: "fa1374155fc5427c72bd09ec5a315172" } Frame { msec: 8032 - hash: "803607ec60ef51b54444a184462beb0f" + hash: "ee35a3edf91865e28b16b9fcab8b4c1c" } Frame { msec: 8048 - hash: "e0b670a80137b3fa8ca9ae8fab5aa123" + hash: "10f2677f7c8efe9f64e401940dec3ef7" } Frame { msec: 8064 - hash: "a291881f5d7a42973ac4a6054418259a" + hash: "b2c53bb14a8a6643e69cad2bbb4aacf4" } Frame { msec: 8080 - hash: "c5ed7f0b91af1bf0eba6c149bccb72ab" + hash: "7b7c7d167aca55464d1874ed726ec646" } Frame { msec: 8096 - hash: "25b094fc7f6e8442ae672439a5b10a79" + hash: "19a828ca70133801f1f470f6e348857b" } Frame { msec: 8112 - hash: "9bc4a4dc68228a400b9e87d645e29828" + hash: "bc829873ea3cf8ca8484d990d4b80aa2" } Key { type: 7 @@ -2258,99 +2258,99 @@ VisualTest { } Frame { msec: 8128 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8144 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8160 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8176 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8192 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8208 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8224 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8240 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8256 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8272 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8288 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8304 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8320 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8336 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8352 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8368 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8384 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8400 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8416 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8432 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8448 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8464 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8480 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Frame { msec: 8496 - hash: "4baf177df487bf872c7edd4ab4561120" + hash: "201b90bc27073e945bb00c85501f4dc8" } Key { type: 6 @@ -2362,35 +2362,35 @@ VisualTest { } Frame { msec: 8512 - hash: "2eabf99cadf1ded6a355bdf39715ad57" + hash: "d0d487fd66bcf4177188d4862bd74bc0" } Frame { msec: 8528 - hash: "2eabf99cadf1ded6a355bdf39715ad57" + hash: "d0d487fd66bcf4177188d4862bd74bc0" } Frame { msec: 8544 - hash: "7e70fd7a53929ef47f69c63273818ee1" + hash: "4a4c2e49e4852748916a4d68710e4ae6" } Frame { msec: 8560 - hash: "e76066a86a120d7abf0d645c804c9e69" + hash: "0135092d8a296b7121495cc3994a0f9d" } Frame { msec: 8576 - hash: "e79a0e6badc18ded04e07ce6b805b493" + hash: "7e004aae70236568d635ba929e085b2b" } Frame { msec: 8592 - hash: "67891f5078a0c34a3fb17bbc325b9011" + hash: "3e6a4f60a57515a6bfe4d803c7c22da8" } Frame { msec: 8608 - hash: "6533d214e86aa581da50d26cc1bcd34e" + hash: "142b866861f539837b0bdabaf48028e7" } Frame { msec: 8624 - hash: "c649e873c3ce3fe5639e8d9b9912eafe" + hash: "32a4757602c923366566d9005c78f6cf" } Key { type: 7 @@ -2406,107 +2406,107 @@ VisualTest { } Frame { msec: 8656 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 8672 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 8688 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 8704 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 8720 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 8736 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 8752 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 8768 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 8784 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 8800 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 8816 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 8832 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 8848 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 8864 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 8880 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 8896 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 8912 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 8928 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 8944 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 8960 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 8976 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 8992 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 9008 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 9024 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 9040 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Frame { msec: 9056 - hash: "3b0e8ae88404e6c12e7918bfc30dc49e" + hash: "358a3fbfa70526a40f2179cb2fd100d4" } Key { type: 6 @@ -2518,39 +2518,39 @@ VisualTest { } Frame { msec: 9072 - hash: "72494522826c29edd9a763342d8ee909" + hash: "b1dc330f31b064f1e3ff4e913773cde8" } Frame { msec: 9088 - hash: "72494522826c29edd9a763342d8ee909" + hash: "b1dc330f31b064f1e3ff4e913773cde8" } Frame { msec: 9104 - hash: "ecba7d108741a940d77920db52f6bc47" + hash: "a0419dede71451f36c93960c8ef8c00c" } Frame { msec: 9120 - hash: "6aa456342c3bb8b6071c28c5d550929e" + hash: "b8141758fc93aa1b286fd60f91e6fa7e" } Frame { msec: 9136 - hash: "bd94dbfa0651b9060cacdbe9a9adc38c" + hash: "8b0d786f239c545be3f51622c336f1e1" } Frame { msec: 9152 - hash: "bb6e75073be7b1e9f3c66761b72611b2" + hash: "25ec52efac83de4f8cade8f257b93b8e" } Frame { msec: 9168 - hash: "11bfc218dd57a9909b1fd7f021577cfa" + hash: "5a1476841b9aaa0e85c397c0447be352" } Frame { msec: 9184 - hash: "d2fbc4d380862423ad2d3a33468b417d" + hash: "d648b0911e6ab78e53121fde8b66b50b" } Frame { msec: 9200 - hash: "0ca09d4275b1c36575e484d79a7d8d2a" + hash: "f552863ff4b76286d03240409c0a928b" } Key { type: 7 @@ -2562,99 +2562,99 @@ VisualTest { } Frame { msec: 9216 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9232 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9248 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9264 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9280 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9296 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9312 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9328 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9344 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9360 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9376 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9392 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9408 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9424 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9440 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9456 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9472 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9488 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9504 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9520 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9536 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9552 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9568 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9584 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9600 @@ -2662,218 +2662,218 @@ VisualTest { } Frame { msec: 9616 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9632 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9648 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9664 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9680 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9696 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9712 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9728 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9744 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9760 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9776 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9792 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9808 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9824 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9840 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9856 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9872 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9888 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9904 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9920 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9936 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9952 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9968 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 9984 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10000 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10016 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10032 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10048 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10064 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10080 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10096 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10112 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10128 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10144 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10160 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10176 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10192 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10208 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10224 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10240 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10256 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10272 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10288 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10304 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10320 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10336 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10352 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10368 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Key { type: 6 key: 16777249 - modifiers: 0 + modifiers: 67108864 text: "" autorep: false count: 1 } Frame { msec: 10384 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10400 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10416 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } Frame { msec: 10432 - hash: "d157fdaf13170250e66768364e90e820" + hash: "f3b4cab7975190f756c923f16ce4c298" } } diff --git a/tests/auto/declarative/visual/focusscope/test3.qml b/tests/auto/declarative/visual/focusscope/test3.qml index af06469..b5feeb5 100644 --- a/tests/auto/declarative/visual/focusscope/test3.qml +++ b/tests/auto/declarative/visual/focusscope/test3.qml @@ -41,7 +41,7 @@ Rectangle { delegate: VerticalDelegate preferredHighlightBegin: 100 preferredHighlightEnd: 101 - strictlyEnforceHighlightRange: true + highlightRangeMode: ListView.StrictlyEnforceRange } diff --git a/tests/auto/declarative/visual/qfxtext/elide/data-X11/elide.0.png b/tests/auto/declarative/visual/qfxtext/elide/data-X11/elide.0.png index b2734e4..5631a46 100644 Binary files a/tests/auto/declarative/visual/qfxtext/elide/data-X11/elide.0.png and b/tests/auto/declarative/visual/qfxtext/elide/data-X11/elide.0.png differ diff --git a/tests/auto/declarative/visual/qfxtext/elide/data-X11/elide.qml b/tests/auto/declarative/visual/qfxtext/elide/data-X11/elide.qml index d5f1cff..cfd832e 100644 --- a/tests/auto/declarative/visual/qfxtext/elide/data-X11/elide.qml +++ b/tests/auto/declarative/visual/qfxtext/elide/data-X11/elide.qml @@ -6,239 +6,239 @@ VisualTest { } Frame { msec: 16 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 32 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 48 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 64 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 80 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 96 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 112 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 128 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 144 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 160 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 176 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 192 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 208 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 224 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 240 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 256 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 272 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 288 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 304 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 320 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 336 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 352 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 368 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 384 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 400 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 416 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 432 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 448 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 464 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 480 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 496 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 512 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 528 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 544 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 560 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 576 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 592 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 608 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 624 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 640 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 656 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 672 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 688 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 704 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 720 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 736 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 752 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 768 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 784 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 800 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 816 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 832 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 848 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 864 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 880 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 896 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 912 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 928 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 944 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 960 @@ -246,34 +246,34 @@ VisualTest { } Frame { msec: 976 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Key { type: 6 key: 16777249 - modifiers: 0 + modifiers: 67108864 text: "" autorep: false count: 1 } Frame { msec: 992 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 1008 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 1024 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 1040 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } Frame { msec: 1056 - hash: "dd213807dd517c25972f0f6f42b01c17" + hash: "48e2da07fd229d9db6afc0eda494cd11" } } diff --git a/tests/auto/declarative/visual/qfxtext/elide/data-X11/multilength.0.png b/tests/auto/declarative/visual/qfxtext/elide/data-X11/multilength.0.png index 6d3931c..6e2b625 100644 Binary files a/tests/auto/declarative/visual/qfxtext/elide/data-X11/multilength.0.png and b/tests/auto/declarative/visual/qfxtext/elide/data-X11/multilength.0.png differ diff --git a/tests/auto/declarative/visual/qfxtext/elide/data-X11/multilength.qml b/tests/auto/declarative/visual/qfxtext/elide/data-X11/multilength.qml index a43fcdd..0c06196 100644 --- a/tests/auto/declarative/visual/qfxtext/elide/data-X11/multilength.qml +++ b/tests/auto/declarative/visual/qfxtext/elide/data-X11/multilength.qml @@ -6,239 +6,239 @@ VisualTest { } Frame { msec: 16 - hash: "0d036aed3200afec73b1fc10cda324af" + hash: "873e914454b7a040b05649ebd1a2f8c5" } Frame { msec: 32 - hash: "e117576c30a5bebb866ee8e0d596f510" + hash: "7682a4f1e361ca252da9713734a598e8" } Frame { msec: 48 - hash: "2a00d57edee71da236ef9a041e7ed0d6" + hash: "fa8884b550c8df872f96b61557163bcf" } Frame { msec: 64 - hash: "fa326ddfc21828d98dd38964c6e9b09b" + hash: "b84ecf9e38f126c3e32defee831d9462" } Frame { msec: 80 - hash: "02d3d8f626f0a3afd57affce32f10cff" + hash: "21cc08f22d1f1fcb38b27a3a4259debe" } Frame { msec: 96 - hash: "81abd357826e75917f5cb3758c0cdd4a" + hash: "93bdfeab813e25e85917f49c0d5f1314" } Frame { msec: 112 - hash: "3c544d599c735224bda95a3a9cbf413f" + hash: "5f03c252602e60fe19879945fa77c203" } Frame { msec: 128 - hash: "59ef105daf3d509ab17b618fc761b4dc" + hash: "f0b2079f6c512bf80989ebfdbec4cfd8" } Frame { msec: 144 - hash: "f61d62a092cc1adf7576992d285eb60a" + hash: "9e7bb12d5b7605fc1d78ed9b2a549527" } Frame { msec: 160 - hash: "8c0f2f793ea61df2dff38ac609365da1" + hash: "242bbbe6da87708c92fd47607ecb789d" } Frame { msec: 176 - hash: "28f9372f9ecfd6c33e5578ea2b8bd202" + hash: "f1db5c3a230b4d3e2e1dfefe6bf032a1" } Frame { msec: 192 - hash: "129757726f161c58ad52c8a2bb8ff54d" + hash: "a416e820efd8e173cc52372218513e33" } Frame { msec: 208 - hash: "517aa84afac3efea0b21fff497951e69" + hash: "df711ab70c6087f8138fded16167f069" } Frame { msec: 224 - hash: "fce8967bf12f6525b21c644aaca2fffd" + hash: "fb28eb2eeccfab28299640ef996c1115" } Frame { msec: 240 - hash: "926108bca8cb3a21b29207e0dca29d9d" + hash: "c72c6d79a50dd7147f6b33784880eb36" } Frame { msec: 256 - hash: "41c0d7a87ad0995c3343f9e2bee558a4" + hash: "4421027e65e95f98499ca53c57220ede" } Frame { msec: 272 - hash: "7992a2eb7a561aa28a9a2f693dab0d5f" + hash: "b7fbfb90d8cc167809e8e846d9021b4b" } Frame { msec: 288 - hash: "b2712c6162cea59cfd18966713252512" + hash: "004614b1bf18e9aa78e78509c4f289aa" } Frame { msec: 304 - hash: "1fa71faa48d7f414a4a6b93214a39a44" + hash: "1792bbd8b69bae1d92fed2a6bcfe0187" } Frame { msec: 320 - hash: "f1ffc3a012ae78f88a5f698944f605a2" + hash: "957a8b95d6e85885d854b8eb1db10b04" } Frame { msec: 336 - hash: "62dfc0e3846e7641453f6bf077bb0671" + hash: "d00c3e4d6d8e8d04b949840c28d73a33" } Frame { msec: 352 - hash: "167f30be62b60eb0e08af046fe18fbb7" + hash: "2b79feaa62d773d92d8a684685b2004c" } Frame { msec: 368 - hash: "1e441db0c591642ce9c0457436708d13" + hash: "ef2f11b187028de0c56b23db3168fbc8" } Frame { msec: 384 - hash: "f4400c089b8e4391c6827323333ef733" + hash: "3a489a96aaeca80355313198b935691d" } Frame { msec: 400 - hash: "6b4e44cb73c62dd833cf52391e8b55a2" + hash: "389f1798f900795a8686c38ace755974" } Frame { msec: 416 - hash: "12286364840fa446009a9005ca0b25fe" + hash: "34fc20be52fe3843420819b9adb90b22" } Frame { msec: 432 - hash: "67971a61bfe3113dcf7404137d58cc65" + hash: "fa715c5b6640eafe204bf3b8095c74b9" } Frame { msec: 448 - hash: "3ff170f552466fa3a0494fc489363f68" + hash: "8e8315edcf23167ac58228b8c28b43e6" } Frame { msec: 464 - hash: "c946293a166077db9426757b2e393006" + hash: "c18e82038f57dd869112cb1be14e4cfe" } Frame { msec: 480 - hash: "14d716e18c7fa7d27b69c93d815df9b9" + hash: "3f07e95b09e39f2e5d93216850f4a4d9" } Frame { msec: 496 - hash: "7bc490a27378ab400658bff0334cb7dd" + hash: "20f0e6eaeac04d6f93565adfab485218" } Frame { msec: 512 - hash: "2a3bd86f88aeb8f09f6feea8ba282942" + hash: "e3f66d1dfe88dd868a54a8493828ef5f" } Frame { msec: 528 - hash: "1ad04b814df09f9a1c672da659ff7390" + hash: "d39d34f63e1b29c187249cb388552b38" } Frame { msec: 544 - hash: "05a4b8bf3ceb70a01d33a5692467bd7e" + hash: "5d2e8df5003732f3b53fff4aaddea06c" } Frame { msec: 560 - hash: "aca0effde610ed1c216b138a7dfe407f" + hash: "35c3aa2dae481a8f817d849b3f3151f2" } Frame { msec: 576 - hash: "296b234ae49eaae3548c7d31447c0765" + hash: "966b78018879224948b4d85fe73d7985" } Frame { msec: 592 - hash: "1254ac81bb961f210dd14cfa650da680" + hash: "0db067bf9debc3f36dd539cf83652fb8" } Frame { msec: 608 - hash: "2b6a03813152cd87469b351339690736" + hash: "ea1c3249ffd2439533907ceaeaafbc56" } Frame { msec: 624 - hash: "12080186fcdd5b9e73720f267cdf1065" + hash: "da85c0e14b95ca9a729984b67ebd52ad" } Frame { msec: 640 - hash: "0cf99a1742df091f0715489d7a54bcd8" + hash: "5c26ae844ac52dbe131fed0638787aac" } Frame { msec: 656 - hash: "bbbde5370000d3bec9872eab0d2c0bd0" + hash: "4b09c23ad624db80afcb2a6c1d5ddb96" } Frame { msec: 672 - hash: "32cb6332b3028ef515ce328450769bd7" + hash: "9995deb3d22b418a19093b4b988b3fcc" } Frame { msec: 688 - hash: "9696c6ea620e833cc1290710895d164f" + hash: "77e53358f2d4392d0ba988187e7e272c" } Frame { msec: 704 - hash: "cce4fc1f40467d22a1a05ec005cad93a" + hash: "3fbbb73e790cf4a0583531fe1580f761" } Frame { msec: 720 - hash: "5466c6bec6b3b0eee159ffcb5ad1130c" + hash: "9d562e141095a258ee61463e644d9889" } Frame { msec: 736 - hash: "2d8ccdca543eb52b1f5f947490d284c5" + hash: "d05633ca49f96bf327bed5c9c0f6ac98" } Frame { msec: 752 - hash: "a72cf61a2e5c70cbdb2b9e99d588ffe1" + hash: "34c38e40e831dbede8fa83de31ed76aa" } Frame { msec: 768 - hash: "2885a4a60d231b8bed4f444f110cd735" + hash: "288e52c8be54f4914f687cef4ce1f24a" } Frame { msec: 784 - hash: "4167cbe045e6f922797eeed9378e96b6" + hash: "0b8b744aaf67e8b17fa459bb0ffb6db5" } Frame { msec: 800 - hash: "2a903361ed6c58659741274eac6c19f4" + hash: "273dbe3e8c21bfeafa516d07778928c8" } Frame { msec: 816 - hash: "e98ad2f87ebb183832efba5954228bea" + hash: "ef94ee1885287c72fa78038547d98b96" } Frame { msec: 832 - hash: "e875b1d4412fd8a86a6e71b08c078fe0" + hash: "965e6387672319ac04fdc42768e581f1" } Frame { msec: 848 - hash: "6fb0d9e4237a74552b9067c288e0d5dd" + hash: "95553d8aaece94c7017e57b03cd46c9a" } Frame { msec: 864 - hash: "a64b5a60fe0184b4e439b157409f7567" + hash: "bdaf35b920e5b08b8639d452afd2d51e" } Frame { msec: 880 - hash: "102d5f88cf9ae13af9983936dbc2ecae" + hash: "0ed16f00e89327dc8679bec42179c4ce" } Frame { msec: 896 - hash: "e1d58edd9cdc3902af02c263b9b357a1" + hash: "8c93e0ac399e09e98e34b90654e0e42a" } Frame { msec: 912 - hash: "d8a934c488f1e80ed49108b360022576" + hash: "93798fbb33adb6c813018757cfa34017" } Frame { msec: 928 - hash: "d918eae34d503a0c3669fa0b5fbd7dad" + hash: "db4d7581e9a1f082a2c29ef7482a7893" } Frame { msec: 944 - hash: "bba616d8933bb054735e235782689c95" + hash: "67e074c1e083334de84a3549f4ee9ca4" } Frame { msec: 960 @@ -246,58 +246,58 @@ VisualTest { } Frame { msec: 976 - hash: "12b8f8889033ecddabf0b20585157a5e" + hash: "b1122c815a755c9988bcf03a3f7d7d6d" } Frame { msec: 992 - hash: "afe7a8d6184f9ebef435e1857a7f08b2" + hash: "31148bae6653bdc3f1827d06de845663" } Frame { msec: 1008 - hash: "d222b51d852e63a9e2401c57b86c17f7" + hash: "812428a944086ca46e102891964dac69" } Frame { msec: 1024 - hash: "36196bcde10012a2e0624ae062da5fdb" + hash: "ee7bb66bd7e8623325200ac994f8b41a" } Frame { msec: 1040 - hash: "e4cb79b57774c652c3bcf86b7e8cbce9" + hash: "6bd21a98e5c373a2c78334a0255e7750" } Frame { msec: 1056 - hash: "79c040be179aa486c6a3e2a5198944af" + hash: "2e8e1eea14068b0e82464ed52ec1ab7a" } Frame { msec: 1072 - hash: "4334a272bed3fdaa1e44bb81c55d3e3a" + hash: "6dca5756e20eeb778e31d7b602ce77d7" } Frame { msec: 1088 - hash: "5aeebf849fb7101b87ec699c4590a348" + hash: "3cbb6700b9e30864a2b1e3d4d71d2a78" } Frame { msec: 1104 - hash: "c18780619ee3069f2ba17d00b85d6941" + hash: "c4d0230d2c4f73191a514e5df4c0b083" } Frame { msec: 1120 - hash: "ef17d1d1b566fc0e51cef54e3f460b91" + hash: "a33df967fe43151dfc503d2ac78f8ca8" } Frame { msec: 1136 - hash: "2c76668596c354dadea513325b79d14e" + hash: "0c7ff101efe60b600cacaf8d04d79053" } Frame { msec: 1152 - hash: "6055f676c9fa2a3333301e6dac958b34" + hash: "d246cfb75d89b9666877860aaf45ba60" } Frame { msec: 1168 - hash: "3fc9e199eac26907d95381e064c0e5cd" + hash: "1130998aa2618a29ec6bc4b9219eedfa" } Frame { msec: 1184 - hash: "60edfb3a25700ead1795e226015eb229" + hash: "741dd83003633bbf8d28c2d4ddd8a2d0" } } diff --git a/tests/auto/declarative/visual/qfxwebview/autosize/data-X11/autosize.0.png b/tests/auto/declarative/visual/qfxwebview/autosize/data-X11/autosize.0.png new file mode 100644 index 0000000..1f28b9a Binary files /dev/null and b/tests/auto/declarative/visual/qfxwebview/autosize/data-X11/autosize.0.png differ diff --git a/tests/auto/declarative/visual/qfxwebview/autosize/data-X11/autosize.qml b/tests/auto/declarative/visual/qfxwebview/autosize/data-X11/autosize.qml new file mode 100644 index 0000000..d920a4c --- /dev/null +++ b/tests/auto/declarative/visual/qfxwebview/autosize/data-X11/autosize.qml @@ -0,0 +1,83 @@ +import Qt.VisualTest 4.6 + +VisualTest { + Frame { + msec: 0 + } + Frame { + msec: 16 + hash: "0c70d855adc847fe33d7959ccb98bb8b" + } + Frame { + msec: 32 + hash: "0c70d855adc847fe33d7959ccb98bb8b" + } + Frame { + msec: 48 + hash: "0c70d855adc847fe33d7959ccb98bb8b" + } + Frame { + msec: 64 + hash: "0c70d855adc847fe33d7959ccb98bb8b" + } + Frame { + msec: 80 + hash: "0c70d855adc847fe33d7959ccb98bb8b" + } + Frame { + msec: 96 + hash: "0c70d855adc847fe33d7959ccb98bb8b" + } + Frame { + msec: 112 + hash: "0c70d855adc847fe33d7959ccb98bb8b" + } + Frame { + msec: 128 + hash: "0c70d855adc847fe33d7959ccb98bb8b" + } + Frame { + msec: 144 + hash: "0c70d855adc847fe33d7959ccb98bb8b" + } + Frame { + msec: 160 + hash: "0c70d855adc847fe33d7959ccb98bb8b" + } + Frame { + msec: 176 + hash: "0c70d855adc847fe33d7959ccb98bb8b" + } + Frame { + msec: 192 + hash: "0c70d855adc847fe33d7959ccb98bb8b" + } + Frame { + msec: 208 + hash: "0c70d855adc847fe33d7959ccb98bb8b" + } + Frame { + msec: 224 + hash: "0c70d855adc847fe33d7959ccb98bb8b" + } + Frame { + msec: 240 + hash: "0c70d855adc847fe33d7959ccb98bb8b" + } + Frame { + msec: 256 + hash: "0c70d855adc847fe33d7959ccb98bb8b" + } + Frame { + msec: 272 + hash: "0c70d855adc847fe33d7959ccb98bb8b" + } + Frame { + msec: 288 + hash: "0c70d855adc847fe33d7959ccb98bb8b" + } + Frame { + msec: 304 + hash: "0c70d855adc847fe33d7959ccb98bb8b" + } +} diff --git a/tests/auto/declarative/visual/rect/GradientRect.qml b/tests/auto/declarative/visual/rect/GradientRect.qml index ed56418..1d3ec98 100644 --- a/tests/auto/declarative/visual/rect/GradientRect.qml +++ b/tests/auto/declarative/visual/rect/GradientRect.qml @@ -2,8 +2,8 @@ import Qt 4.6 Item { id: rect - property string color - property string border : "" + property color color + property color border : Qt.rgba(0,0,0,0) property int rotation property int radius property int borderWidth @@ -14,7 +14,7 @@ Item { anchors.centerIn: parent; rotation: rect.rotation; Rectangle { anchors.centerIn: parent; width: 80; height: 80 - border.color: rect.border; border.width: rect.border != "" ? 2 : 0 + border.color: rect.border; border.width: rect.border != Qt.rgba(0,0,0,0) ? 2 : 0 radius: rect.radius; smooth: rect.smooth gradient: Gradient { GradientStop { position: 0.0; color: rect.color } diff --git a/tests/auto/declarative/visual/rect/MyRect.qml b/tests/auto/declarative/visual/rect/MyRect.qml index 9b6c3ae..22e0948 100644 --- a/tests/auto/declarative/visual/rect/MyRect.qml +++ b/tests/auto/declarative/visual/rect/MyRect.qml @@ -2,8 +2,8 @@ import Qt 4.6 Item { id: rect - property string color - property string border : "" + property color color + property color border : Qt.rgba(0,0,0,0) property int rotation property int radius property int borderWidth @@ -14,7 +14,7 @@ Item { anchors.centerIn: parent; rotation: rect.rotation; Rectangle { anchors.centerIn: parent; width: 80; height: 80 - color: rect.color; border.color: rect.border; border.width: rect.border != "" ? 2 : 0 + color: rect.color; border.color: rect.border; border.width: rect.border != Qt.rgba(0,0,0,0) ? 2 : 0 radius: rect.radius; smooth: rect.smooth } } diff --git a/tests/auto/declarative/visual/rect/data-X11/rect-painting.0.png b/tests/auto/declarative/visual/rect/data-X11/rect-painting.0.png new file mode 100644 index 0000000..9af5b68 Binary files /dev/null and b/tests/auto/declarative/visual/rect/data-X11/rect-painting.0.png differ diff --git a/tests/auto/declarative/visual/rect/data-X11/rect-painting.qml b/tests/auto/declarative/visual/rect/data-X11/rect-painting.qml new file mode 100644 index 0000000..8f780e1 --- /dev/null +++ b/tests/auto/declarative/visual/rect/data-X11/rect-painting.qml @@ -0,0 +1,355 @@ +import Qt.VisualTest 4.6 + +VisualTest { + Frame { + msec: 0 + } + Frame { + msec: 16 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 32 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 48 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 64 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 80 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 96 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 112 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 128 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 144 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 160 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 176 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 192 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 208 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 224 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 240 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 256 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 272 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 288 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 304 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 320 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 336 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 352 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 368 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 384 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 400 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 416 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 432 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 448 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 464 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 480 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 496 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 512 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 528 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 544 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 560 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 576 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 592 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 608 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 624 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 640 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 656 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 672 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 688 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 704 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 720 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 736 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 752 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 768 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 784 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 800 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 816 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 832 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 848 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 864 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 880 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 896 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 912 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 928 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 944 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 960 + image: "rect-painting.0.png" + } + Frame { + msec: 976 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 992 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1008 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1024 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1040 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1056 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1072 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1088 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1104 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1120 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1136 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1152 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1168 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1184 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1200 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1216 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1232 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1248 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1264 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1280 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1296 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1312 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Key { + type: 6 + key: 16777249 + modifiers: 67108864 + text: "" + autorep: false + count: 1 + } + Frame { + msec: 1328 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1344 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } + Frame { + msec: 1360 + hash: "8a4f7a3d55b1b19fb1b8c211c00a7ba7" + } +} -- cgit v0.12 From d50d1f9e8e8e4e75699baf21a27c03350ab49e27 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Wed, 4 Nov 2009 17:31:51 +1000 Subject: docs (somewhere is better than nowhere) --- tests/auto/declarative/visual/tst_visual.cpp | 31 +++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/tests/auto/declarative/visual/tst_visual.cpp b/tests/auto/declarative/visual/tst_visual.cpp index 0cd712b..e40dec7 100644 --- a/tests/auto/declarative/visual/tst_visual.cpp +++ b/tests/auto/declarative/visual/tst_visual.cpp @@ -258,10 +258,39 @@ void usage() fprintf(stderr, "\n"); fprintf(stderr, "QML related options\n"); fprintf(stderr, " -record file : record new test data for file\n"); + fprintf(stderr, " -recordnovisuals file : record new test data for file, but ignore visuals\n"); fprintf(stderr, " -play file : playback test data for file, printing errors\n"); fprintf(stderr, " -testvisuals file : playback test data for file, without errors\n"); fprintf(stderr, " -updatevisuals file : playback test data for file, accept new visuals for file\n"); fprintf(stderr, " -updateplatformvisuals file : playback test data for file, accept new visuals for file only on current platform (MacOSX/Win32/X11/QWS/S60)\n"); + fprintf(stderr, "\n" + "Visual tests are recordings of manual interactions with a QML test,\n" + "that can then be run automatically. To record a new test, run:\n" + "\n" + " tst_visuals -record yourtestdir/yourtest # Note, no .qml extension\n" + "\n" + "This records everything you do (try to keep it short).\n" + "To play back a test, run:\n" + "\n" + " tst_visuals -play yourtestdir/yourtest\n" + "\n" + "Your test may include QML code to test itself, reporting any error to an\n" + "'error' property on the root object - the test will fail if this property\n" + "gets set to anything non-empty.\n" + "\n" + "If your test changes slightly but is still correct (check with -play), you\n" + "can update the visuals by running:\n" + "\n" + " tst_visuals -updatevisuals yourtestdir/yourtest\n" + "\n" + "If your test includes platform-sensitive visuals (eg. text in system fonts),\n" + "you should create platform-specific visuals, using -updateplatformvisuals\n" + "instead.\n" + "\n" + "If you ONLY wish to use the 'error' property, you can record your test with\n" + "-recordnovisuals, or discard existing visuals with -removevisuals; the test\n" + "will then only fail on a syntax error, crash, or non-empty 'error' property.\n" + ); } int main(int argc, char **argv) @@ -303,7 +332,7 @@ int main(int argc, char **argv) newArgv[newArgc++] = argv[ii]; } - if (arg == "-help") { + if (arg == "-help" || arg == "-?") { atexit(usage); showHelp = true; } -- cgit v0.12 From b58a8d487e0af4bbe378377333a954b5f71612e9 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 4 Nov 2009 10:02:18 +0100 Subject: Rebuild configure.exe (using a vs2005 compiler) The same was done in 4.6 (04d5735a) --- configure.exe | Bin 2170880 -> 1204224 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/configure.exe b/configure.exe index dabf10c..30e881e 100755 Binary files a/configure.exe and b/configure.exe differ -- cgit v0.12 From 819b891df17dc9e7f5e1840c8347abbf3c1f31a7 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Thu, 5 Nov 2009 07:35:50 +1000 Subject: Add missing file. --- tests/auto/declarative/qmlxmllistmodel/data/model2.qml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 tests/auto/declarative/qmlxmllistmodel/data/model2.qml diff --git a/tests/auto/declarative/qmlxmllistmodel/data/model2.qml b/tests/auto/declarative/qmlxmllistmodel/data/model2.qml new file mode 100644 index 0000000..140e0ad --- /dev/null +++ b/tests/auto/declarative/qmlxmllistmodel/data/model2.qml @@ -0,0 +1,11 @@ +import Qt 4.6 + +XmlListModel { + source: "model.xml" + query: "/Pets/Pet" + XmlRole { name: "name"; query: "name/string()" } + XmlRole { name: "type"; query: "type/string()" } + XmlRole { name: "age"; query: "age/number()" } + XmlRole { name: "size"; query: "size/string()" } + XmlRole { name: "tricks"; query: "tricks/string()" } +} -- cgit v0.12 From 283932b8aae35974e88f760d5cfa561ee0e333d0 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Thu, 5 Nov 2009 09:03:14 +1000 Subject: Missing file for 48ea5a5c74620f9811debc6bf1e49bf095d30722 --- src/declarative/qml/qmlvme.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp index 62ec025..f3d0f65 100644 --- a/src/declarative/qml/qmlvme.cpp +++ b/src/declarative/qml/qmlvme.cpp @@ -591,7 +591,7 @@ QObject *QmlVME::run(QStack &stack, QmlContext *ctxt, stack.at(stack.count() - 1 - instr.assignBinding.context); QmlMetaProperty mp; - mp.restore(instr.assignBinding.property, target, ctxt); + QmlMetaPropertyPrivate::restore(mp, instr.assignBinding.property, target, ctxt); int coreIndex = mp.coreIndex(); @@ -648,7 +648,7 @@ QObject *QmlVME::run(QStack &stack, QmlContext *ctxt, QmlPropertyValueSource *vs = reinterpret_cast(reinterpret_cast(obj) + instr.assignValueSource.castValue); QObject *target = stack.at(stack.count() - 1 - instr.assignValueSource.owner); QmlMetaProperty prop; - prop.restore(instr.assignValueSource.property, target, ctxt); + QmlMetaPropertyPrivate::restore(prop, instr.assignValueSource.property, target, ctxt); obj->setParent(target); vs->setTarget(prop); } @@ -660,7 +660,7 @@ QObject *QmlVME::run(QStack &stack, QmlContext *ctxt, QmlPropertyValueInterceptor *vi = reinterpret_cast(reinterpret_cast(obj) + instr.assignValueInterceptor.castValue); QObject *target = stack.at(stack.count() - 1 - instr.assignValueInterceptor.owner); QmlMetaProperty prop; - prop.restore(instr.assignValueInterceptor.property, target, ctxt); + QmlMetaPropertyPrivate::restore(prop, instr.assignValueInterceptor.property, target, ctxt); obj->setParent(target); vi->setTarget(prop); QmlVMEMetaObject *mo = static_cast((QMetaObject*)target->metaObject()); -- cgit v0.12 From e24370f2d8d1604175e7426bf69daaf90c5de70c Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Thu, 5 Nov 2009 09:24:35 +1000 Subject: declarative.pro update --- tests/auto/declarative/declarative.pro | 69 ++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index f09d6cf..1be38a8 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -1,38 +1,41 @@ TEMPLATE = subdirs -SUBDIRS += anchors \ - animatedimage \ - animations \ - behaviors \ - datetimeformatter \ +SUBDIRS += \ + anchors \ # Cover + animatedimage \ # Cover + animations \ # Cover + behaviors \ # Cover + datetimeformatter \ # Cover examples \ - layouts \ - listview \ - numberformatter \ - pathview \ - qfxloader \ - qmlpixmapcache \ - qfxtextedit \ - qfxtextinput \ - qfxwebview \ - qmetaobjectbuilder \ - qmlcontext \ - qmldom \ - qmlecmascript \ - qmlgraphicstext \ - qmlgraphicsborderimage \ - qmlfontloader \ - qmllanguage \ - qmllist \ - qmllistaccessor \ - qmlmetaproperty \ - qmlmetatype \ - qmlpropertymap \ - qmltimer \ - qmlxmllistmodel \ - repeater \ - sql \ - states \ - visual + layouts \ # Cover + listview \ # Cover + numberformatter \ # Cover + pathview \ # Cover + qfxloader \ # Cover + qfxtextedit \ # Cover + qfxtextinput \ # Cover + qfxwebview \ # Cover + qmetaobjectbuilder \ # Cover + qmlcontext \ # Cover + qmldom \ # Cover + qmlecmascript \ # Cover + qmlfontloader \ # Cover + qmlgraphicsborderimage \ # Cover + qmlgraphicsparticles \ # Cover + qmlgraphicstext \ # Cover + qmllanguage \ # Cover + qmllist \ # Cover + qmllistaccessor \ # Cover + qmlmetaproperty \ # Cover + qmlmetatype \ # Cover + qmlpixmapcache \ # Cover + qmlpropertymap \ # Cover + qmlqt \ # Cover + qmltimer \ # Cover + qmlxmllistmodel \ # Cover + repeater \ # Cover + sql \ # Cover + states \ # Cover + visual # Cover # Tests which should run in Pulse PULSE_TESTS = $$SUBDIRS -- cgit v0.12