diff options
76 files changed, 1044 insertions, 727 deletions
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp index 240f16c..8e92eb4 100644 --- a/src/declarative/qml/qmlcompiler.cpp +++ b/src/declarative/qml/qmlcompiler.cpp @@ -1714,7 +1714,7 @@ bool QmlCompiler::buildGroupedProperty(QmlParser::Property *prop, prop->value, obj, ctxt.incr())); obj->addValueTypeProperty(prop); } else { - COMPILE_EXCEPTION(prop, qApp->translate("QmlCompiler","Invalid property access")); + COMPILE_EXCEPTION(prop, qApp->translate("QmlCompiler","Invalid grouped property access")); } } else { @@ -1722,7 +1722,7 @@ bool QmlCompiler::buildGroupedProperty(QmlParser::Property *prop, prop->value->metatype = QmlEnginePrivate::get(engine)->metaObjectForType(prop->type); if (!prop->value->metatype) - COMPILE_EXCEPTION(prop, qApp->translate("QmlCompiler","Cannot nest non-QObject property \"%1\"").arg(QString::fromUtf8(prop->name))); + COMPILE_EXCEPTION(prop, qApp->translate("QmlCompiler","Invalid grouped property access")); obj->addGroupedProperty(prop); @@ -1749,8 +1749,11 @@ bool QmlCompiler::buildValueTypeProperty(QObject *type, prop->index = idx; prop->type = p.userType(); - if (prop->value || prop->values.count() != 1) - COMPILE_EXCEPTION(prop, qApp->translate("QmlCompiler","Invalid property use")); + if (prop->value) + COMPILE_EXCEPTION(prop, qApp->translate("QmlCompiler","Property assignment expected")); + + if (prop->values.count() != 1) + COMPILE_EXCEPTION(prop, qApp->translate("QmlCompiler","Single property assignment expected")); Value *value = prop->values.at(0); @@ -1758,7 +1761,7 @@ bool QmlCompiler::buildValueTypeProperty(QObject *type, bool isPropertyValue = output->types.at(value->object->type).type->propertyValueSourceCast() != -1; bool isPropertyInterceptor = output->types.at(value->object->type).type->propertyValueInterceptorCast() != -1; if (!isPropertyValue && !isPropertyInterceptor) { - COMPILE_EXCEPTION(prop, qApp->translate("QmlCompiler","Invalid property use")); + COMPILE_EXCEPTION(prop, qApp->translate("QmlCompiler","Unexpected object assignment")); } else { COMPILE_CHECK(buildObject(value->object, ctxt)); diff --git a/tests/auto/declarative/anchors/data/anchors.qml b/tests/auto/declarative/anchors/data/anchors.qml index 377dd2d..765e5b6 100644 --- a/tests/auto/declarative/anchors/data/anchors.qml +++ b/tests/auto/declarative/anchors/data/anchors.qml @@ -114,4 +114,31 @@ Rectangle { y: 70; width: 10; height: 10 anchors.horizontalCenter: parent.left } + Rectangle { + id: Rect22; objectName: "Rect22" + width: 10; height: 10 + anchors.centerIn: MasterRect + } + Rectangle { + id: Rect23; objectName: "Rect23" + anchors.left: MasterRect.left + anchors.leftMargin: 5 + anchors.right: MasterRect.right + anchors.rightMargin: 5 + anchors.top: MasterRect.top + anchors.topMargin: 5 + anchors.bottom: MasterRect.bottom + anchors.bottomMargin: 5 + } + Text { + id: text1; objectName: "text1" + y: 200; + text: "Hello" + } + Text { + id: text2; objectName: "text2" + anchors.baseline: text1.baseline + anchors.left: text1.right + text: "World" + } } diff --git a/tests/auto/declarative/anchors/tst_anchors.cpp b/tests/auto/declarative/anchors/tst_anchors.cpp index 8abf04f..c3a857c 100644 --- a/tests/auto/declarative/anchors/tst_anchors.cpp +++ b/tests/auto/declarative/anchors/tst_anchors.cpp @@ -43,6 +43,7 @@ #include <QtDeclarative/qmlcomponent.h> #include <QtDeclarative/qmlview.h> #include <private/qmlgraphicsrectangle_p.h> +#include <private/qmlgraphicstext_p.h> #include <QtDeclarative/private/qmlgraphicsanchors_p_p.h> @@ -131,6 +132,21 @@ void tst_anchors::basicAnchors() QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect20"))->x(), 235.0); QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect21"))->x(), -5.0); + //centerIn + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect22"))->x(), 69.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect22"))->y(), 5.0); + + //margins + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect23"))->x(), 31.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect23"))->y(), 5.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect23"))->width(), 86.0); + QCOMPARE(findItem<QmlGraphicsRectangle>(view->root(), QLatin1String("Rect23"))->height(), 10.0); + + //baseline + QmlGraphicsText *text1 = findItem<QmlGraphicsText>(view->root(), QLatin1String("text1")); + QmlGraphicsText *text2 = findItem<QmlGraphicsText>(view->root(), QLatin1String("text2")); + QCOMPARE(text1->y(), text2->y()); + delete view; } diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index 82b135f..64672f6 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -7,7 +7,7 @@ SUBDIRS += \ datetimeformatter \ # Cover examples \ layouts \ # Cover - listview \ # Cover + qmlgraphicslistview \ # Cover qmlgraphicsgridview \ # Cover numberformatter \ # Cover pathview \ # Cover diff --git a/tests/auto/declarative/listview/data/listview-enforcerange.qml b/tests/auto/declarative/qmlgraphicslistview/data/listview-enforcerange.qml index 46fddae..46fddae 100644 --- a/tests/auto/declarative/listview/data/listview-enforcerange.qml +++ b/tests/auto/declarative/qmlgraphicslistview/data/listview-enforcerange.qml diff --git a/tests/auto/declarative/listview/data/listview-sections.qml b/tests/auto/declarative/qmlgraphicslistview/data/listview-sections.qml index 56700be..56700be 100644 --- a/tests/auto/declarative/listview/data/listview-sections.qml +++ b/tests/auto/declarative/qmlgraphicslistview/data/listview-sections.qml diff --git a/tests/auto/declarative/listview/data/listview.qml b/tests/auto/declarative/qmlgraphicslistview/data/listview.qml index b7b838b..b7b838b 100644 --- a/tests/auto/declarative/listview/data/listview.qml +++ b/tests/auto/declarative/qmlgraphicslistview/data/listview.qml diff --git a/tests/auto/declarative/listview/listview.pro b/tests/auto/declarative/qmlgraphicslistview/qmlgraphicslistview.pro index 23b0706..f00de39 100644 --- a/tests/auto/declarative/listview/listview.pro +++ b/tests/auto/declarative/qmlgraphicslistview/qmlgraphicslistview.pro @@ -2,7 +2,7 @@ load(qttest_p4) contains(QT_CONFIG,declarative): QT += declarative macx:CONFIG -= app_bundle -SOURCES += tst_listview.cpp +SOURCES += tst_qmlgraphicslistview.cpp # Define SRCDIR equal to test's source directory DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/declarative/listview/tst_listview.cpp b/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp index 5575ace..9f904b8 100644 --- a/tests/auto/declarative/listview/tst_listview.cpp +++ b/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp @@ -850,4 +850,4 @@ QList<T*> tst_QmlGraphicsListView::findItems(QmlGraphicsItem *parent, const QStr QTEST_MAIN(tst_QmlGraphicsListView) -#include "tst_listview.moc" +#include "tst_qmlgraphicslistview.moc" diff --git a/tests/auto/declarative/qmlgraphicstext/tst_qmlgraphicstext.cpp b/tests/auto/declarative/qmlgraphicstext/tst_qmlgraphicstext.cpp index 2a3cdde..1e10873 100644 --- a/tests/auto/declarative/qmlgraphicstext/tst_qmlgraphicstext.cpp +++ b/tests/auto/declarative/qmlgraphicstext/tst_qmlgraphicstext.cpp @@ -45,6 +45,7 @@ #include <private/qmlgraphicstext_p.h> #include <private/qmlvaluetype_p.h> #include <QFontMetrics> +#include <QGraphicsSceneMouseEvent> #include <math.h> class tst_qmlgraphicstext : public QObject @@ -78,6 +79,8 @@ private slots: void letterSpacing(); void wordSpacing(); + void clickLink(); + private: QStringList standard; QStringList richText; @@ -258,6 +261,10 @@ void tst_qmlgraphicstext::wrap() QVERIFY(textObject != 0); QCOMPARE(textObject->width(), 30.); QVERIFY(textObject->height() > textHeight); + + int oldHeight = textObject->height(); + textObject->setWidth(100); + QVERIFY(textObject->height() < oldHeight); } for (int i = 0; i < richText.size(); i++) @@ -730,6 +737,54 @@ void tst_qmlgraphicstext::wordSpacing() } } +class EventSender : public QGraphicsItem +{ +public: + void sendEvent(QEvent *event) { sceneEvent(event); } +}; + +class LinkTest : public QObject +{ + Q_OBJECT +public: + LinkTest() {} + + QString link; + +public slots: + void linkClicked(QString l) { link = l; } +}; + +void tst_qmlgraphicstext::clickLink() +{ + { + QString componentStr = "import Qt 4.6\nText { text: \"<a href=\\\"http://qt.nokia.com\\\">Hello world!</a>\" }"; + QmlComponent textComponent(&engine, componentStr.toLatin1(), QUrl("file://")); + QmlGraphicsText *textObject = qobject_cast<QmlGraphicsText*>(textComponent.create()); + + QVERIFY(textObject != 0); + + LinkTest test; + QObject::connect(textObject, SIGNAL(linkActivated(QString)), &test, SLOT(linkClicked(QString))); + + { + QGraphicsSceneMouseEvent me(QEvent::GraphicsSceneMousePress); + me.setPos(QPointF(textObject->x()/2, textObject->y()/2)); + me.setButton(Qt::LeftButton); + static_cast<EventSender*>(static_cast<QGraphicsItem*>(textObject))->sendEvent(&me); + } + + { + QGraphicsSceneMouseEvent me(QEvent::GraphicsSceneMouseRelease); + me.setPos(QPointF(textObject->x()/2, textObject->y()/2)); + me.setButton(Qt::LeftButton); + static_cast<EventSender*>(static_cast<QGraphicsItem*>(textObject))->sendEvent(&me); + } + + QCOMPARE(test.link, QLatin1String("http://qt.nokia.com")); + } +} + QTEST_MAIN(tst_qmlgraphicstext) #include "tst_qmlgraphicstext.moc" diff --git a/tests/auto/declarative/qmllanguage/data/assignBasicTypes.qml b/tests/auto/declarative/qmllanguage/data/assignBasicTypes.qml index 50723a3..c86c96b 100644 --- a/tests/auto/declarative/qmllanguage/data/assignBasicTypes.qml +++ b/tests/auto/declarative/qmllanguage/data/assignBasicTypes.qml @@ -23,6 +23,7 @@ MyTypeObject { boolProperty: true variantProperty: "Hello World!" vectorProperty: "10,1,2.2" + urlProperty: "main.qml" objectProperty: MyTypeObject { intProperty: 8 } } diff --git a/tests/auto/declarative/qmllanguage/data/attachedProperties.qml b/tests/auto/declarative/qmllanguage/data/attachedProperties.qml index 8343754..fec96cc 100644 --- a/tests/auto/declarative/qmllanguage/data/attachedProperties.qml +++ b/tests/auto/declarative/qmllanguage/data/attachedProperties.qml @@ -1,5 +1,8 @@ import Test 1.0 +import Test 1.0 as Namespace import Qt 4.6 + Object { MyQmlObject.value: 10 + Namespace.MyQmlObject.value2: 13 } diff --git a/tests/auto/declarative/qmllanguage/data/fakeDotProperty.errors.txt b/tests/auto/declarative/qmllanguage/data/fakeDotProperty.errors.txt index e56ad3a..3074823 100644 --- a/tests/auto/declarative/qmllanguage/data/fakeDotProperty.errors.txt +++ b/tests/auto/declarative/qmllanguage/data/fakeDotProperty.errors.txt @@ -1 +1 @@ -3:5:Invalid property access +3:5:Invalid grouped property access diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.errors.txt new file mode 100644 index 0000000..68fe671 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.errors.txt @@ -0,0 +1 @@ +5:17:Cannot assign to non-existant property "foo" diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.qml new file mode 100644 index 0000000..e99c635 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.1.qml @@ -0,0 +1,7 @@ +import Test 1.0 +import Qt 4.6 + +Object { + MyQmlObject.foo: 10 +} + diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.errors.txt new file mode 100644 index 0000000..7f630f4 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.errors.txt @@ -0,0 +1 @@ +5:15:Non-existant attached object diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.qml new file mode 100644 index 0000000..8f987ce --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.10.qml @@ -0,0 +1,6 @@ +import Test 1.0 as Namespace +import Qt 4.6 + +Object { + Namespace.MadeUpClass.foo: 10 +} diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.errors.txt new file mode 100644 index 0000000..fee5050 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.errors.txt @@ -0,0 +1 @@ +5:15:Not an attached property name diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.qml new file mode 100644 index 0000000..18770fc --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.11.qml @@ -0,0 +1,7 @@ +import Test 1.0 as Namespace +import Qt 4.6 + +Object { + Namespace.madeUpClass.foo: 10 +} + diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.errors.txt new file mode 100644 index 0000000..9f06e07 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.errors.txt @@ -0,0 +1 @@ +5:27:Cannot assign to non-existant property "foo" diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.qml new file mode 100644 index 0000000..3c9ae5b --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.2.qml @@ -0,0 +1,6 @@ +import Test 1.0 as Namespace +import Qt 4.6 + +Object { + Namespace.MyQmlObject.foo: 10 +} diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.errors.txt new file mode 100644 index 0000000..05161c4 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.errors.txt @@ -0,0 +1 @@ +5:5:Invalid attached object assignment diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.qml new file mode 100644 index 0000000..e9405a4 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.3.qml @@ -0,0 +1,8 @@ +import Test 1.0 +import Qt 4.6 + +Object { + MyQmlObject: 10 +} + + diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.errors.txt new file mode 100644 index 0000000..a208bcf --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.errors.txt @@ -0,0 +1 @@ +5:15:Invalid attached object assignment diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.qml new file mode 100644 index 0000000..6fbf718 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.4.qml @@ -0,0 +1,7 @@ +import Test 1.0 as Namespace +import Qt 4.6 + +Object { + Namespace.MyQmlObject: 10 +} + diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.errors.txt new file mode 100644 index 0000000..05161c4 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.errors.txt @@ -0,0 +1 @@ +5:5:Invalid attached object assignment diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.qml new file mode 100644 index 0000000..1827a16 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.5.qml @@ -0,0 +1,7 @@ +import Test 1.0 +import Qt 4.6 + +Object { + MyQmlObject: Object {} +} + diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.errors.txt new file mode 100644 index 0000000..e232b23 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.errors.txt @@ -0,0 +1 @@ +5:5:Non-existant attached object diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.qml new file mode 100644 index 0000000..5c7f0ec --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.6.qml @@ -0,0 +1,7 @@ +import Test 1.0 +import Qt 4.6 + +Object { + Test.MyQmlObject: Object {} +} + diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.errors.txt new file mode 100644 index 0000000..e232b23 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.errors.txt @@ -0,0 +1 @@ +5:5:Non-existant attached object diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.qml new file mode 100644 index 0000000..841cc08 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.7.qml @@ -0,0 +1,6 @@ +import Test 1.0 +import Qt 4.6 + +Object { + MyTypeObject.foo: 10 +} diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.errors.txt new file mode 100644 index 0000000..7f630f4 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.errors.txt @@ -0,0 +1 @@ +5:15:Non-existant attached object diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.qml new file mode 100644 index 0000000..f1b4b96 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.8.qml @@ -0,0 +1,6 @@ +import Test 1.0 as Namespace +import Qt 4.6 + +Object { + Namespace.MyTypeObject.foo: 10 +} diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.errors.txt new file mode 100644 index 0000000..e232b23 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.errors.txt @@ -0,0 +1 @@ +5:5:Non-existant attached object diff --git a/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.qml b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.qml new file mode 100644 index 0000000..99c4a5c --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidAttachedProperty.9.qml @@ -0,0 +1,7 @@ +import Test 1.0 +import Qt 4.6 + +Object { + MadeUpClass.foo: 10 +} + diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.1.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.1.errors.txt index 7c00ce4..810fd31 100644 --- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.1.errors.txt +++ b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.1.errors.txt @@ -1 +1 @@ -5:5:Invalid property access +5:5:Invalid grouped property access diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.2.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.2.errors.txt index 7c00ce4..810fd31 100644 --- a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.2.errors.txt +++ b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.2.errors.txt @@ -1 +1 @@ -5:5:Invalid property access +5:5:Invalid grouped property access diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.3.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.3.errors.txt new file mode 100644 index 0000000..f6d6f29 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.3.errors.txt @@ -0,0 +1 @@ +4:5:Invalid grouped property access diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.3.qml b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.3.qml new file mode 100644 index 0000000..0bbfc4f --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.3.qml @@ -0,0 +1,5 @@ +import Test 1.0 + +MyQmlObject { + customType.x: 10 +} diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.4.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.4.errors.txt new file mode 100644 index 0000000..19934fa --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.4.errors.txt @@ -0,0 +1 @@ +4:5:Cannot assign to non-existant property "foo" diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.4.qml b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.4.qml new file mode 100644 index 0000000..134fef9 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.4.qml @@ -0,0 +1,5 @@ +import Test 1.0 + +MyQmlObject { + foo.x: 10 +} diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.5.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.5.errors.txt new file mode 100644 index 0000000..2c8a970 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.5.errors.txt @@ -0,0 +1 @@ +4:18:Property assignment expected diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.5.qml b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.5.qml new file mode 100644 index 0000000..55cefe6 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.5.qml @@ -0,0 +1,5 @@ +import Test 1.0 + +MyTypeObject { + rectProperty.x.foo: 100 +} diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.6.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.6.errors.txt new file mode 100644 index 0000000..8331725 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.6.errors.txt @@ -0,0 +1 @@ +5:18:Single property assignment expected diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.6.qml b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.6.qml new file mode 100644 index 0000000..9ec33ab --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.6.qml @@ -0,0 +1,6 @@ +import Test 1.0 + +MyTypeObject { + rectProperty.x: 100 + rectProperty.x: 101 +} diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.7.errors.txt b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.7.errors.txt new file mode 100644 index 0000000..4a7e383 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.7.errors.txt @@ -0,0 +1 @@ +4:-1:Cannot set properties on nullGrouped as it is null diff --git a/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.7.qml b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.7.qml new file mode 100644 index 0000000..b77fb90 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/invalidGroupedProperty.7.qml @@ -0,0 +1,5 @@ +import Test 1.0 + +MyTypeObject { + nullGrouped.script: print(1921) +} diff --git a/tests/auto/declarative/qmllanguage/data/missingValueTypeProperty.errors.txt b/tests/auto/declarative/qmllanguage/data/missingValueTypeProperty.errors.txt new file mode 100644 index 0000000..dfaa218 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/missingValueTypeProperty.errors.txt @@ -0,0 +1 @@ +4:18:Cannot assign to non-existant property "foo" diff --git a/tests/auto/declarative/qmllanguage/data/missingValueTypeProperty.qml b/tests/auto/declarative/qmllanguage/data/missingValueTypeProperty.qml new file mode 100644 index 0000000..9a0fa6a --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/missingValueTypeProperty.qml @@ -0,0 +1,5 @@ +import Test 1.0 + +MyTypeObject { + rectProperty.foo: 9 +} diff --git a/tests/auto/declarative/qmllanguage/data/objectValueTypeProperty.errors.txt b/tests/auto/declarative/qmllanguage/data/objectValueTypeProperty.errors.txt new file mode 100644 index 0000000..db7d9c0 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/objectValueTypeProperty.errors.txt @@ -0,0 +1 @@ +4:18:Unexpected object assignment diff --git a/tests/auto/declarative/qmllanguage/data/objectValueTypeProperty.qml b/tests/auto/declarative/qmllanguage/data/objectValueTypeProperty.qml new file mode 100644 index 0000000..9924773 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/objectValueTypeProperty.qml @@ -0,0 +1,6 @@ +import Test 1.0 + +MyTypeObject { + rectProperty.x: MyTypeObject {} +} + diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.15.errors.txt b/tests/auto/declarative/qmllanguage/data/wrongType.15.errors.txt new file mode 100644 index 0000000..44768e3 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/wrongType.15.errors.txt @@ -0,0 +1 @@ +3:18:Invalid property assignment: url expected diff --git a/tests/auto/declarative/qmllanguage/data/wrongType.15.qml b/tests/auto/declarative/qmllanguage/data/wrongType.15.qml new file mode 100644 index 0000000..633a5ba --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/wrongType.15.qml @@ -0,0 +1,4 @@ +import Test 1.0 +MyTypeObject { + urlProperty: 12 +} diff --git a/tests/auto/declarative/qmllanguage/testtypes.h b/tests/auto/declarative/qmllanguage/testtypes.h index e654faa..b251f87 100644 --- a/tests/auto/declarative/qmllanguage/testtypes.h +++ b/tests/auto/declarative/qmllanguage/testtypes.h @@ -80,14 +80,19 @@ class MyAttachedObject : public QObject { Q_OBJECT Q_PROPERTY(int value READ value WRITE setValue) + Q_PROPERTY(int value2 READ value2 WRITE setValue2) public: - MyAttachedObject(QObject *parent) : QObject(parent), m_value(0) {} + MyAttachedObject(QObject *parent) : QObject(parent), m_value(0), m_value2(0) {} int value() const { return m_value; } void setValue(int v) { m_value = v; } + int value2() const { return m_value2; } + void setValue2(int v) { m_value2 = v; } + private: int m_value; + int m_value2; }; class MyQmlObject : public QObject, public MyInterface, public QmlParserStatus @@ -201,9 +206,11 @@ class MyTypeObject : public QObject 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(QUrl urlProperty READ urlProperty WRITE setUrlProperty); Q_PROPERTY(QmlScriptString scriptProperty READ scriptProperty WRITE setScriptProperty); Q_PROPERTY(MyGroupedObject *grouped READ grouped CONSTANT); + Q_PROPERTY(MyGroupedObject *nullGrouped READ nullGrouped CONSTANT); public: MyTypeObject() @@ -413,6 +420,14 @@ public: vectorPropertyValue = v; } + QUrl urlPropertyValue; + QUrl urlProperty() const { + return urlPropertyValue; + } + void setUrlProperty(const QUrl &v) { + urlPropertyValue = v; + } + QmlScriptString scriptPropertyValue; QmlScriptString scriptProperty() const { return scriptPropertyValue; @@ -424,6 +439,8 @@ public: MyGroupedObject groupedValue; MyGroupedObject *grouped() { return &groupedValue; } + MyGroupedObject *nullGrouped() { return 0; } + void doAction() { emit action(); } signals: void action(); diff --git a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp index c646583..c23bb2d 100644 --- a/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp +++ b/tests/auto/declarative/qmllanguage/tst_qmllanguage.cpp @@ -141,6 +141,7 @@ private: QFile file(QLatin1String("data/") + QLatin1String(errorfile)); \ QVERIFY(file.open(QIODevice::ReadOnly)); \ QByteArray data = file.readAll(); \ + file.close(); \ QList<QByteArray> expected = data.split('\n'); \ expected.removeAll(QByteArray("")); \ QList<QmlError> errors = component.errors(); \ @@ -154,7 +155,16 @@ private: } \ if (qgetenv("DEBUG") != "" && expected != actual) \ qWarning() << "Expected:" << expected << "Actual:" << actual; \ - QCOMPARE(expected, actual); \ + if (qgetenv("QMLLANGUAGE_UPDATEERRORS") != "" && expected != actual) {\ + QFile file(QLatin1String("data/") + QLatin1String(errorfile)); \ + QVERIFY(file.open(QIODevice::WriteOnly)); \ + for (int ii = 0; ii < actual.count(); ++ii) { \ + file.write(actual.at(ii)); file.write("\n"); \ + } \ + file.close(); \ + } else { \ + QCOMPARE(expected, actual); \ + } \ } inline QUrl TEST_FILE(const QString &filename) @@ -214,6 +224,7 @@ void tst_qmllanguage::errors_data() QTest::newRow("wrongType (color for size)") << "wrongType.12.qml" << "wrongType.12.errors.txt" << false; QTest::newRow("wrongType (number string for int)") << "wrongType.13.qml" << "wrongType.13.errors.txt" << false; QTest::newRow("wrongType (int for string)") << "wrongType.14.qml" << "wrongType.14.errors.txt" << false; + QTest::newRow("wrongType (int for url)") << "wrongType.15.qml" << "wrongType.15.errors.txt" << false; QTest::newRow("readOnly.1") << "readOnly.1.qml" << "readOnly.1.errors.txt" << false; QTest::newRow("readOnly.2") << "readOnly.2.qml" << "readOnly.2.errors.txt" << false; @@ -240,8 +251,14 @@ void tst_qmllanguage::errors_data() QTest::newRow("missingSignal") << "missingSignal.qml" << "missingSignal.errors.txt" << false; QTest::newRow("finalOverride") << "finalOverride.qml" << "finalOverride.errors.txt" << false; QTest::newRow("customParserIdNotAllowed") << "customParserIdNotAllowed.qml" << "customParserIdNotAllowed.errors.txt" << false; + QTest::newRow("invalidGroupedProperty.1") << "invalidGroupedProperty.1.qml" << "invalidGroupedProperty.1.errors.txt" << false; QTest::newRow("invalidGroupedProperty.2") << "invalidGroupedProperty.2.qml" << "invalidGroupedProperty.2.errors.txt" << false; + QTest::newRow("invalidGroupedProperty.3") << "invalidGroupedProperty.3.qml" << "invalidGroupedProperty.3.errors.txt" << false; + QTest::newRow("invalidGroupedProperty.4") << "invalidGroupedProperty.4.qml" << "invalidGroupedProperty.4.errors.txt" << false; + QTest::newRow("invalidGroupedProperty.5") << "invalidGroupedProperty.5.qml" << "invalidGroupedProperty.5.errors.txt" << false; + QTest::newRow("invalidGroupedProperty.6") << "invalidGroupedProperty.6.qml" << "invalidGroupedProperty.6.errors.txt" << false; + QTest::newRow("invalidGroupedProperty.7") << "invalidGroupedProperty.7.qml" << "invalidGroupedProperty.7.errors.txt" << true; QTest::newRow("importNamespaceConflict") << "importNamespaceConflict.qml" << "importNamespaceConflict.errors.txt" << false; QTest::newRow("importVersionMissing (builtin)") << "importVersionMissingBuiltIn.qml" << "importVersionMissingBuiltIn.errors.txt" << false; @@ -278,13 +295,28 @@ void tst_qmllanguage::errors_data() 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("invalidAttachedProperty.1") << "invalidAttachedProperty.1.qml" << "invalidAttachedProperty.1.errors.txt" << false; + QTest::newRow("invalidAttachedProperty.2") << "invalidAttachedProperty.2.qml" << "invalidAttachedProperty.2.errors.txt" << false; + QTest::newRow("invalidAttachedProperty.3") << "invalidAttachedProperty.3.qml" << "invalidAttachedProperty.3.errors.txt" << false; + QTest::newRow("invalidAttachedProperty.4") << "invalidAttachedProperty.4.qml" << "invalidAttachedProperty.4.errors.txt" << false; + QTest::newRow("invalidAttachedProperty.5") << "invalidAttachedProperty.5.qml" << "invalidAttachedProperty.5.errors.txt" << false; + QTest::newRow("invalidAttachedProperty.6") << "invalidAttachedProperty.6.qml" << "invalidAttachedProperty.6.errors.txt" << false; + QTest::newRow("invalidAttachedProperty.7") << "invalidAttachedProperty.7.qml" << "invalidAttachedProperty.7.errors.txt" << false; + QTest::newRow("invalidAttachedProperty.8") << "invalidAttachedProperty.8.qml" << "invalidAttachedProperty.8.errors.txt" << false; + QTest::newRow("invalidAttachedProperty.9") << "invalidAttachedProperty.9.qml" << "invalidAttachedProperty.9.errors.txt" << false; + QTest::newRow("invalidAttachedProperty.10") << "invalidAttachedProperty.10.qml" << "invalidAttachedProperty.10.errors.txt" << false; + QTest::newRow("invalidAttachedProperty.11") << "invalidAttachedProperty.11.qml" << "invalidAttachedProperty.11.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; QTest::newRow("invalidRoot") << "invalidRoot.qml" << "invalidRoot.errors.txt" << false; + QTest::newRow("missingValueTypeProperty") << "missingValueTypeProperty.qml" << "missingValueTypeProperty.errors.txt" << false; + QTest::newRow("objectValueTypeProperty") << "objectValueTypeProperty.qml" << "objectValueTypeProperty.errors.txt" << false; } + void tst_qmllanguage::errors() { QFETCH(QString, file); @@ -420,6 +452,7 @@ void tst_qmllanguage::assignBasicTypes() QCOMPARE(object->boolProperty(), true); QCOMPARE(object->variantProperty(), QVariant("Hello World!")); QCOMPARE(object->vectorProperty(), QVector3D(10, 1, 2.2)); + QCOMPARE(object->urlProperty(), component.url().resolved(QUrl("main.qml"))); QVERIFY(object->objectProperty() != 0); MyTypeObject *child = qobject_cast<MyTypeObject *>(object->objectProperty()); QVERIFY(child != 0); @@ -611,6 +644,7 @@ void tst_qmllanguage::attachedProperties() QObject *attached = qmlAttachedPropertiesObject<MyQmlObject>(object); QVERIFY(attached != 0); QCOMPARE(attached->property("value"), QVariant(10)); + QCOMPARE(attached->property("value2"), QVariant(13)); } // Tests non-static object properties diff --git a/tests/auto/declarative/qmlsystempalette/tst_qmlsystempalette.cpp b/tests/auto/declarative/qmlsystempalette/tst_qmlsystempalette.cpp index 039eaa8..2648463 100644 --- a/tests/auto/declarative/qmlsystempalette/tst_qmlsystempalette.cpp +++ b/tests/auto/declarative/qmlsystempalette/tst_qmlsystempalette.cpp @@ -38,7 +38,9 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #include <qtest.h> +#include <QDebug> #include <QtDeclarative/qmlengine.h> #include <QtDeclarative/qmlcomponent.h> #include <private/qmlsystempalette_p.h> @@ -56,6 +58,7 @@ private slots: void activePalette(); void inactivePalette(); void disabledPalette(); + void paletteChanged(); private: QmlEngine engine; @@ -149,6 +152,30 @@ void tst_qmlsystempalette::disabledPalette() delete object; } +void tst_qmlsystempalette::paletteChanged() +{ + QString componentStr = "import Qt 4.6\nSystemPalette { }"; + QmlComponent component(&engine, componentStr.toLatin1(), QUrl("file://")); + QmlSystemPalette *object = qobject_cast<QmlSystemPalette*>(component.create()); + + QVERIFY(object != 0); + + QPalette p; + p.setCurrentColorGroup(QPalette::Active); + p.setColor(QPalette::Active, QPalette::Text, QColor("red")); + p.setColor(QPalette::Active, QPalette::ButtonText, QColor("green")); + p.setColor(QPalette::Active, QPalette::WindowText, QColor("blue")); + + qApp->setPalette(p); + + object->setColorGroup(QmlSystemPalette::Active); + QTRY_COMPARE(QColor("red"), object->text()); + QTRY_COMPARE(QColor("green"), object->buttonText()); + QTRY_COMPARE(QColor("blue"), object->windowText()); + + delete object; +} + QTEST_MAIN(tst_qmlsystempalette) #include "tst_qmlsystempalette.moc" diff --git a/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.qml b/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.qml deleted file mode 100644 index 266c9a3..0000000 --- a/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.qml +++ /dev/null @@ -1,351 +0,0 @@ -import Qt.VisualTest 4.6 - -VisualTest { - Frame { - msec: 0 - } - Frame { - msec: 16 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 32 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 48 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 64 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 80 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 96 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 112 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 128 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 144 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 160 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 176 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 192 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 208 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 224 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 240 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 256 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 272 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 288 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 304 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 320 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 336 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 352 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 368 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 384 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 400 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 416 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 432 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 448 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 464 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 480 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 496 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 512 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 528 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 544 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 560 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 576 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 592 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 608 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 624 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 640 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 656 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 672 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 688 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 704 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 720 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 736 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 752 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 768 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 784 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 800 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 816 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 832 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 848 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 864 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 880 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 896 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 912 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 928 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 944 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 960 - image: "plaintext.0.png" - } - Frame { - msec: 976 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 992 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 1008 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 1024 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 1040 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 1056 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 1072 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 1088 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 1104 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 1120 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 1136 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 1152 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 1168 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 1184 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Key { - type: 6 - key: 16777249 - modifiers: 0 - text: "" - autorep: false - count: 1 - } - Frame { - msec: 1200 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 1216 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 1232 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 1248 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 1264 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 1280 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 1296 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 1312 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 1328 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } - Frame { - msec: 1344 - hash: "9f3d0a505dec1982d9b405be72c265f8" - } -} diff --git a/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.qml b/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.qml deleted file mode 100644 index e971809..0000000 --- a/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.qml +++ /dev/null @@ -1,359 +0,0 @@ -import Qt.VisualTest 4.6 - -VisualTest { - Frame { - msec: 0 - } - Frame { - msec: 16 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 32 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 48 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 64 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 80 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 96 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 112 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 128 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 144 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 160 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 176 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 192 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 208 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 224 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 240 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 256 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 272 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 288 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 304 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 320 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 336 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 352 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 368 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 384 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 400 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 416 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 432 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 448 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 464 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 480 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 496 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 512 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 528 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 544 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 560 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 576 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 592 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 608 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 624 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 640 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 656 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 672 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 688 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 704 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 720 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 736 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 752 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 768 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 784 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 800 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 816 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 832 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 848 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 864 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 880 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 896 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 912 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 928 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 944 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 960 - image: "richtext.0.png" - } - Frame { - msec: 976 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 992 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1008 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1024 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1040 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1056 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1072 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1088 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1104 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1120 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1136 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1152 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Key { - type: 6 - key: 16777249 - modifiers: 0 - text: "" - autorep: false - count: 1 - } - Frame { - msec: 1168 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1184 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1200 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1216 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1232 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1248 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1264 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1280 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1296 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1312 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1328 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1344 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1360 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } - Frame { - msec: 1376 - hash: "259cc9829171ea866dac4ffe8ef6b489" - } -} diff --git a/tests/auto/declarative/visual/qfxtext/elide/data-X11/elide.0.png b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/elide.0.png Binary files differindex 5631a46..5631a46 100644 --- a/tests/auto/declarative/visual/qfxtext/elide/data-X11/elide.0.png +++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/elide.0.png diff --git a/tests/auto/declarative/visual/qfxtext/elide/data-X11/elide.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/elide.qml index cfd832e..cfd832e 100644 --- a/tests/auto/declarative/visual/qfxtext/elide/data-X11/elide.qml +++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/elide.qml diff --git a/tests/auto/declarative/visual/qfxtext/elide/data-X11/multilength.0.png b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/multilength.0.png Binary files differindex 6e2b625..6e2b625 100644 --- a/tests/auto/declarative/visual/qfxtext/elide/data-X11/multilength.0.png +++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/multilength.0.png diff --git a/tests/auto/declarative/visual/qfxtext/elide/data-X11/multilength.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/multilength.qml index 0c06196..0c06196 100644 --- a/tests/auto/declarative/visual/qfxtext/elide/data-X11/multilength.qml +++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/data-X11/multilength.qml diff --git a/tests/auto/declarative/visual/qfxtext/elide/data/elide.0.png b/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide.0.png Binary files differindex 1a8c89b..1a8c89b 100644 --- a/tests/auto/declarative/visual/qfxtext/elide/data/elide.0.png +++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide.0.png diff --git a/tests/auto/declarative/visual/qfxtext/elide/data/elide.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide.qml index 59f17f7..59f17f7 100644 --- a/tests/auto/declarative/visual/qfxtext/elide/data/elide.qml +++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/data/elide.qml diff --git a/tests/auto/declarative/visual/qfxtext/elide/elide.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/elide.qml index 3c9ea5b..3c9ea5b 100644 --- a/tests/auto/declarative/visual/qfxtext/elide/elide.qml +++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/elide.qml diff --git a/tests/auto/declarative/visual/qfxtext/elide/multilength.qml b/tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml index fa74cc4..fa74cc4 100644 --- a/tests/auto/declarative/visual/qfxtext/elide/multilength.qml +++ b/tests/auto/declarative/visual/qmlgraphicstext/elide/multilength.qml diff --git a/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.0.png b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.0.png Binary files differindex a54a327..05a6e51 100644 --- a/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.0.png +++ b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.0.png diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.qml b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.qml new file mode 100644 index 0000000..7e591c8 --- /dev/null +++ b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.qml @@ -0,0 +1,351 @@ +import Qt.VisualTest 4.6 + +VisualTest { + Frame { + msec: 0 + } + Frame { + msec: 16 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 32 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 48 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 64 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 80 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 96 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 112 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 128 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 144 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 160 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 176 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 192 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 208 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 224 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 240 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 256 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 272 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 288 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 304 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 320 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 336 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 352 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 368 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 384 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 400 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 416 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 432 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 448 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 464 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 480 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 496 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 512 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 528 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 544 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 560 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 576 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 592 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 608 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 624 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 640 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 656 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 672 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 688 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 704 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 720 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 736 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 752 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 768 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 784 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 800 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 816 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 832 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 848 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 864 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 880 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 896 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 912 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 928 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 944 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 960 + image: "plaintext.0.png" + } + Frame { + msec: 976 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 992 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 1008 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 1024 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 1040 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 1056 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 1072 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 1088 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 1104 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 1120 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 1136 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 1152 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 1168 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 1184 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Key { + type: 6 + key: 16777249 + modifiers: 67108864 + text: "" + autorep: false + count: 1 + } + Frame { + msec: 1200 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 1216 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 1232 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 1248 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 1264 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 1280 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 1296 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 1312 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 1328 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } + Frame { + msec: 1344 + hash: "d6479cc04d67055c2fd8f4ed2fca829b" + } +} diff --git a/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.0.png b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.0.png Binary files differindex c2ddee1..6379942 100644 --- a/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.0.png +++ b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.0.png diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.qml b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.qml new file mode 100644 index 0000000..4414c1c --- /dev/null +++ b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/richtext.qml @@ -0,0 +1,359 @@ +import Qt.VisualTest 4.6 + +VisualTest { + Frame { + msec: 0 + } + Frame { + msec: 16 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 32 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 48 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 64 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 80 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 96 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 112 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 128 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 144 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 160 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 176 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 192 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 208 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 224 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 240 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 256 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 272 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 288 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 304 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 320 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 336 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 352 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 368 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 384 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 400 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 416 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 432 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 448 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 464 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 480 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 496 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 512 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 528 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 544 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 560 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 576 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 592 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 608 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 624 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 640 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 656 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 672 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 688 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 704 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 720 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 736 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 752 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 768 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 784 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 800 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 816 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 832 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 848 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 864 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 880 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 896 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 912 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 928 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 944 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 960 + image: "richtext.0.png" + } + Frame { + msec: 976 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 992 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1008 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1024 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1040 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1056 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1072 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1088 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1104 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1120 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1136 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1152 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Key { + type: 6 + key: 16777249 + modifiers: 67108864 + text: "" + autorep: false + count: 1 + } + Frame { + msec: 1168 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1184 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1200 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1216 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1232 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1248 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1264 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1280 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1296 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1312 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1328 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1344 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1360 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } + Frame { + msec: 1376 + hash: "b902ff73e7c943bb09b5d2ae6c7a760e" + } +} diff --git a/tests/auto/declarative/visual/qfxtext/font/data/plaintext.0.png b/tests/auto/declarative/visual/qmlgraphicstext/font/data/plaintext.0.png Binary files differindex 50d56dc..50d56dc 100644 --- a/tests/auto/declarative/visual/qfxtext/font/data/plaintext.0.png +++ b/tests/auto/declarative/visual/qmlgraphicstext/font/data/plaintext.0.png diff --git a/tests/auto/declarative/visual/qfxtext/font/data/plaintext.qml b/tests/auto/declarative/visual/qmlgraphicstext/font/data/plaintext.qml index f4cbcbd..f4cbcbd 100644 --- a/tests/auto/declarative/visual/qfxtext/font/data/plaintext.qml +++ b/tests/auto/declarative/visual/qmlgraphicstext/font/data/plaintext.qml diff --git a/tests/auto/declarative/visual/qfxtext/font/data/richtext.0.png b/tests/auto/declarative/visual/qmlgraphicstext/font/data/richtext.0.png Binary files differindex 2910670..2910670 100644 --- a/tests/auto/declarative/visual/qfxtext/font/data/richtext.0.png +++ b/tests/auto/declarative/visual/qmlgraphicstext/font/data/richtext.0.png diff --git a/tests/auto/declarative/visual/qfxtext/font/data/richtext.qml b/tests/auto/declarative/visual/qmlgraphicstext/font/data/richtext.qml index 9f396c2..9f396c2 100644 --- a/tests/auto/declarative/visual/qfxtext/font/data/richtext.qml +++ b/tests/auto/declarative/visual/qmlgraphicstext/font/data/richtext.qml diff --git a/tests/auto/declarative/visual/qfxtext/font/plaintext.qml b/tests/auto/declarative/visual/qmlgraphicstext/font/plaintext.qml index f219e09..a3aa929 100644 --- a/tests/auto/declarative/visual/qfxtext/font/plaintext.qml +++ b/tests/auto/declarative/visual/qmlgraphicstext/font/plaintext.qml @@ -55,10 +55,10 @@ Rectangle { text: s.text; horizontalAlignment: Text.AlignLeft; width: 800 } Text { - text: s.text; horizontalAlignment: Text.AlignHCenter; width: 800 + text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: 800; height: 20 } Text { - text: s.text; horizontalAlignment: Text.AlignRight; width: 800 + text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: 800; height: 20 } Text { text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"; wrap: true; width: 200 diff --git a/tests/auto/declarative/visual/qfxtext/font/richtext.qml b/tests/auto/declarative/visual/qmlgraphicstext/font/richtext.qml index 00a9749..35aa232 100644 --- a/tests/auto/declarative/visual/qfxtext/font/richtext.qml +++ b/tests/auto/declarative/visual/qmlgraphicstext/font/richtext.qml @@ -55,10 +55,10 @@ Rectangle { text: s.text; horizontalAlignment: Text.AlignLeft; width: 800 } Text { - text: s.text; horizontalAlignment: Text.AlignHCenter; width: 800 + text: s.text; horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter; width: 800; height: 20 } Text { - text: s.text; horizontalAlignment: Text.AlignRight; width: 800 + text: s.text; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignBottom; width: 800; height: 20 } Text { text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"; wrap: true; width: 200 |
