From 106aa2327cdd341b948b442ac3867bbab610ada7 Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Mon, 16 Nov 2009 15:46:49 +1000
Subject: Path autotests
---
.../declarative/qmlgraphicspathview/data/path.qml | 14 +++++++
.../tst_qmlgraphicspathview.cpp | 47 ++++++++++++++++++++++
2 files changed, 61 insertions(+)
create mode 100644 tests/auto/declarative/qmlgraphicspathview/data/path.qml
diff --git a/tests/auto/declarative/qmlgraphicspathview/data/path.qml b/tests/auto/declarative/qmlgraphicspathview/data/path.qml
new file mode 100644
index 0000000..7e82a48
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicspathview/data/path.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+
+Path {
+ startX: 120; startY: 100
+
+ PathAttribute { name: "scale"; value: 1.0 }
+ PathQuad { x: 120; y: 25; controlX: 260; controlY: 75 }
+ PathPercent { value: 0.3 }
+ PathLine { x: 120; y: 100 }
+ PathCubic {
+ x: 180; y: 0; control1X: -10; control1Y: 90
+ control2X: 210; control2Y: 90
+ }
+}
diff --git a/tests/auto/declarative/qmlgraphicspathview/tst_qmlgraphicspathview.cpp b/tests/auto/declarative/qmlgraphicspathview/tst_qmlgraphicspathview.cpp
index c36b969..561392a 100644
--- a/tests/auto/declarative/qmlgraphicspathview/tst_qmlgraphicspathview.cpp
+++ b/tests/auto/declarative/qmlgraphicspathview/tst_qmlgraphicspathview.cpp
@@ -39,6 +39,7 @@
**
****************************************************************************/
#include <private/qmlgraphicspathview_p.h>
+#include <private/qmlgraphicspath_p.h>
#include <qmlcontext.h>
#include <qmlexpression.h>
#include <qtest.h>
@@ -57,6 +58,7 @@ private slots:
void initValues();
void pathview2();
void pathview3();
+ void path();
};
@@ -118,6 +120,51 @@ void tst_QmlGraphicsPathView::pathview3()
QCOMPARE(obj->pathItemCount(), 4);
}
+void tst_QmlGraphicsPathView::path()
+{
+ QmlEngine engine;
+ QmlComponent c(&engine, QUrl("file://" SRCDIR "/data/path.qml"));
+ QmlGraphicsPath *obj = qobject_cast<QmlGraphicsPath*>(c.create());
+
+ QVERIFY(obj != 0);
+ QCOMPARE(obj->startX(), 120.);
+ QCOMPARE(obj->startY(), 100.);
+ QVERIFY(obj->path() != QPainterPath());
+
+ QList<QmlGraphicsPathElement*> *list = obj->pathElements();
+ QCOMPARE(list->count(), 5);
+
+ QmlGraphicsPathAttribute* attr = qobject_cast<QmlGraphicsPathAttribute*>(list->at(0));
+ QVERIFY(attr != 0);
+ QCOMPARE(attr->name(), QString("scale"));
+ QCOMPARE(attr->value(), 1.0);
+
+ QmlGraphicsPathQuad* quad = qobject_cast<QmlGraphicsPathQuad*>(list->at(1));
+ QVERIFY(quad != 0);
+ QCOMPARE(quad->x(), 120.);
+ QCOMPARE(quad->y(), 25.);
+ QCOMPARE(quad->controlX(), 260.);
+ QCOMPARE(quad->controlY(), 75.);
+
+ QmlGraphicsPathPercent* perc = qobject_cast<QmlGraphicsPathPercent*>(list->at(2));
+ QVERIFY(perc != 0);
+ QCOMPARE(perc->value(), 0.3);
+
+ QmlGraphicsPathLine* line = qobject_cast<QmlGraphicsPathLine*>(list->at(3));
+ QVERIFY(line != 0);
+ QCOMPARE(line->x(), 120.);
+ QCOMPARE(line->y(), 100.);
+
+ QmlGraphicsPathCubic* cubic = qobject_cast<QmlGraphicsPathCubic*>(list->at(4));
+ QVERIFY(cubic != 0);
+ QCOMPARE(cubic->x(), 180.);
+ QCOMPARE(cubic->y(), 0.);
+ QCOMPARE(cubic->control1X(), -10.);
+ QCOMPARE(cubic->control1Y(), 90.);
+ QCOMPARE(cubic->control2X(), 210.);
+ QCOMPARE(cubic->control2Y(), 90.);
+}
+
QTEST_MAIN(tst_QmlGraphicsPathView)
#include "tst_qmlgraphicspathview.moc"
--
cgit v0.12
From f620b2d3b2994c2a4749e0040aaf5f23eadad889 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Mon, 16 Nov 2009 16:09:58 +1000
Subject: Loader network tests
---
src/declarative/qml/qmlcompositetypemanager.cpp | 2 +-
.../declarative/qmlgraphicsloader/NoResize.qml | 7 --
.../declarative/qmlgraphicsloader/Rect120x60.qml | 6 --
.../qmlgraphicsloader/SetSourceComponent.qml | 6 --
.../declarative/qmlgraphicsloader/SizeToItem.qml | 6 --
.../declarative/qmlgraphicsloader/SizeToLoader.qml | 7 --
.../qmlgraphicsloader/data/NoResize.qml | 7 ++
.../qmlgraphicsloader/data/Rect120x60.qml | 6 ++
.../qmlgraphicsloader/data/SetSourceComponent.qml | 6 ++
.../qmlgraphicsloader/data/SizeToItem.qml | 6 ++
.../qmlgraphicsloader/data/SizeToLoader.qml | 7 ++
.../qmlgraphicsloader/qmlgraphicsloader.pro | 8 +-
.../qmlgraphicsloader/tst_qmlgraphicsloader.cpp | 97 ++++++++++++++++------
13 files changed, 111 insertions(+), 60 deletions(-)
delete mode 100644 tests/auto/declarative/qmlgraphicsloader/NoResize.qml
delete mode 100644 tests/auto/declarative/qmlgraphicsloader/Rect120x60.qml
delete mode 100644 tests/auto/declarative/qmlgraphicsloader/SetSourceComponent.qml
delete mode 100644 tests/auto/declarative/qmlgraphicsloader/SizeToItem.qml
delete mode 100644 tests/auto/declarative/qmlgraphicsloader/SizeToLoader.qml
create mode 100644 tests/auto/declarative/qmlgraphicsloader/data/NoResize.qml
create mode 100644 tests/auto/declarative/qmlgraphicsloader/data/Rect120x60.qml
create mode 100644 tests/auto/declarative/qmlgraphicsloader/data/SetSourceComponent.qml
create mode 100644 tests/auto/declarative/qmlgraphicsloader/data/SizeToItem.qml
create mode 100644 tests/auto/declarative/qmlgraphicsloader/data/SizeToLoader.qml
diff --git a/src/declarative/qml/qmlcompositetypemanager.cpp b/src/declarative/qml/qmlcompositetypemanager.cpp
index 7dbe788..fa68951 100644
--- a/src/declarative/qml/qmlcompositetypemanager.cpp
+++ b/src/declarative/qml/qmlcompositetypemanager.cpp
@@ -168,6 +168,7 @@ QmlCompositeTypeData *QmlCompositeTypeManager::get(const QUrl &url)
if (!unit) {
unit = new QmlCompositeTypeData;
unit->status = QmlCompositeTypeData::Waiting;
+ unit->progress = 0.0;
unit->imports.setBaseUrl(url);
components.insert(url.toString(), unit);
@@ -217,7 +218,6 @@ void QmlCompositeTypeManager::replyFinished()
Q_ASSERT(unit);
if (reply->error() != QNetworkReply::NoError) {
-
QString errorDescription;
// ### - Fill in error
errorDescription = QLatin1String("Network error for URL ") +
diff --git a/tests/auto/declarative/qmlgraphicsloader/NoResize.qml b/tests/auto/declarative/qmlgraphicsloader/NoResize.qml
deleted file mode 100644
index cfbb55a..0000000
--- a/tests/auto/declarative/qmlgraphicsloader/NoResize.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Qt 4.6
-
-Loader {
- resizeMode: "NoResize"
- width: 200; height: 80
- source: "Rect120x60.qml"
-}
diff --git a/tests/auto/declarative/qmlgraphicsloader/Rect120x60.qml b/tests/auto/declarative/qmlgraphicsloader/Rect120x60.qml
deleted file mode 100644
index aa4b0c2..0000000
--- a/tests/auto/declarative/qmlgraphicsloader/Rect120x60.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-Rectangle {
- width: 120
- height:60
-}
diff --git a/tests/auto/declarative/qmlgraphicsloader/SetSourceComponent.qml b/tests/auto/declarative/qmlgraphicsloader/SetSourceComponent.qml
deleted file mode 100644
index 1db56c4..0000000
--- a/tests/auto/declarative/qmlgraphicsloader/SetSourceComponent.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-Item {
- Component { id: comp; Rectangle { width: 100; height: 50 } }
- Loader { sourceComponent: comp }
-}
diff --git a/tests/auto/declarative/qmlgraphicsloader/SizeToItem.qml b/tests/auto/declarative/qmlgraphicsloader/SizeToItem.qml
deleted file mode 100644
index b52fa03..0000000
--- a/tests/auto/declarative/qmlgraphicsloader/SizeToItem.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import Qt 4.6
-
-Loader {
- resizeMode: "SizeLoaderToItem"
- source: "Rect120x60.qml"
-}
diff --git a/tests/auto/declarative/qmlgraphicsloader/SizeToLoader.qml b/tests/auto/declarative/qmlgraphicsloader/SizeToLoader.qml
deleted file mode 100644
index 1a107e1..0000000
--- a/tests/auto/declarative/qmlgraphicsloader/SizeToLoader.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import Qt 4.6
-
-Loader {
- resizeMode: "SizeItemToLoader"
- width: 200; height: 80
- source: "Rect120x60.qml"
-}
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/NoResize.qml b/tests/auto/declarative/qmlgraphicsloader/data/NoResize.qml
new file mode 100644
index 0000000..cfbb55a
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicsloader/data/NoResize.qml
@@ -0,0 +1,7 @@
+import Qt 4.6
+
+Loader {
+ resizeMode: "NoResize"
+ width: 200; height: 80
+ source: "Rect120x60.qml"
+}
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/Rect120x60.qml b/tests/auto/declarative/qmlgraphicsloader/data/Rect120x60.qml
new file mode 100644
index 0000000..aa4b0c2
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicsloader/data/Rect120x60.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+Rectangle {
+ width: 120
+ height:60
+}
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/SetSourceComponent.qml b/tests/auto/declarative/qmlgraphicsloader/data/SetSourceComponent.qml
new file mode 100644
index 0000000..1db56c4
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicsloader/data/SetSourceComponent.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+Item {
+ Component { id: comp; Rectangle { width: 100; height: 50 } }
+ Loader { sourceComponent: comp }
+}
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/SizeToItem.qml b/tests/auto/declarative/qmlgraphicsloader/data/SizeToItem.qml
new file mode 100644
index 0000000..b52fa03
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicsloader/data/SizeToItem.qml
@@ -0,0 +1,6 @@
+import Qt 4.6
+
+Loader {
+ resizeMode: "SizeLoaderToItem"
+ source: "Rect120x60.qml"
+}
diff --git a/tests/auto/declarative/qmlgraphicsloader/data/SizeToLoader.qml b/tests/auto/declarative/qmlgraphicsloader/data/SizeToLoader.qml
new file mode 100644
index 0000000..1a107e1
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicsloader/data/SizeToLoader.qml
@@ -0,0 +1,7 @@
+import Qt 4.6
+
+Loader {
+ resizeMode: "SizeItemToLoader"
+ width: 200; height: 80
+ source: "Rect120x60.qml"
+}
diff --git a/tests/auto/declarative/qmlgraphicsloader/qmlgraphicsloader.pro b/tests/auto/declarative/qmlgraphicsloader/qmlgraphicsloader.pro
index 8be8cdf..4837075 100644
--- a/tests/auto/declarative/qmlgraphicsloader/qmlgraphicsloader.pro
+++ b/tests/auto/declarative/qmlgraphicsloader/qmlgraphicsloader.pro
@@ -1,7 +1,11 @@
load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative gui
+contains(QT_CONFIG,declarative): QT += declarative gui network
macx:CONFIG -= app_bundle
-SOURCES += tst_qmlgraphicsloader.cpp
+INCLUDEPATH += ../shared/
+HEADERS += ../shared/testhttpserver.h
+SOURCES += tst_qmlgraphicsloader.cpp \
+ ../shared/testhttpserver.cpp
DEFINES += SRCDIR=\\\"$$PWD\\\"
+
diff --git a/tests/auto/declarative/qmlgraphicsloader/tst_qmlgraphicsloader.cpp b/tests/auto/declarative/qmlgraphicsloader/tst_qmlgraphicsloader.cpp
index a88026b..a5f769e 100644
--- a/tests/auto/declarative/qmlgraphicsloader/tst_qmlgraphicsloader.cpp
+++ b/tests/auto/declarative/qmlgraphicsloader/tst_qmlgraphicsloader.cpp
@@ -42,6 +42,23 @@
#include <QtDeclarative/qmlengine.h>
#include <QtDeclarative/qmlcomponent.h>
#include <private/qmlgraphicsloader_p.h>
+#include "testhttpserver.h"
+
+#define SERVER_PORT 14445
+
+inline QUrl TEST_FILE(const QString &filename)
+{
+ return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
+}
+
+#define TRY_WAIT(expr) \
+ do { \
+ for (int ii = 0; ii < 6; ++ii) { \
+ if ((expr)) break; \
+ QTest::qWait(50); \
+ } \
+ QVERIFY((expr)); \
+ } while (false)
class tst_QmlGraphicsLoader : public QObject
@@ -60,23 +77,13 @@ private slots:
void sizeLoaderToItem();
void sizeItemToLoader();
void noResize();
+ void networkRequest();
+ void failNetworkRequest();
private:
QmlEngine engine;
};
-/*
-inline QUrl TEST_FILE(const QString &filename)
-{
- QFileInfo fileInfo(__FILE__);
- return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath(filename));
-}
-
-inline QUrl TEST_FILE(const char *filename)
-{
- return TEST_FILE(QLatin1String(filename));
-}
-*/
tst_QmlGraphicsLoader::tst_QmlGraphicsLoader()
{
@@ -84,11 +91,11 @@ tst_QmlGraphicsLoader::tst_QmlGraphicsLoader()
void tst_QmlGraphicsLoader::url()
{
- QmlComponent component(&engine, QByteArray("import Qt 4.6\nLoader { source: \"Rect120x60.qml\" }"), QUrl("file://" SRCDIR "/"));
+ QmlComponent component(&engine, QByteArray("import Qt 4.6\nLoader { source: \"Rect120x60.qml\" }"), TEST_FILE(""));
QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
QVERIFY(loader != 0);
QVERIFY(loader->item());
- QVERIFY(loader->source() == QUrl("file://" SRCDIR "/Rect120x60.qml"));
+ QVERIFY(loader->source() == QUrl("file://" SRCDIR "/data/Rect120x60.qml"));
QCOMPARE(loader->progress(), 1.0);
QCOMPARE(loader->status(), QmlGraphicsLoader::Ready);
QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
@@ -98,7 +105,7 @@ void tst_QmlGraphicsLoader::url()
void tst_QmlGraphicsLoader::component()
{
- QmlComponent component(&engine, QUrl("file://" SRCDIR "/SetSourceComponent.qml"));
+ QmlComponent component(&engine, TEST_FILE("/SetSourceComponent.qml"));
QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(component.create());
QVERIFY(item);
@@ -114,9 +121,9 @@ void tst_QmlGraphicsLoader::component()
void tst_QmlGraphicsLoader::invalidUrl()
{
- QTest::ignoreMessage(QtWarningMsg, "(:-1: File error for URL file://" SRCDIR "/IDontExist.qml) ");
+ QTest::ignoreMessage(QtWarningMsg, "(:-1: File error for URL file://" SRCDIR "/data/IDontExist.qml) ");
- QmlComponent component(&engine, QByteArray("import Qt 4.6\nLoader { source: \"IDontExist.qml\" }"), QUrl("file://" SRCDIR "/"));
+ QmlComponent component(&engine, QByteArray("import Qt 4.6\nLoader { source: \"IDontExist.qml\" }"), TEST_FILE(""));
QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
QVERIFY(loader != 0);
QVERIFY(loader->item() == 0);
@@ -136,7 +143,7 @@ void tst_QmlGraphicsLoader::clear()
" source: 'Rect120x60.qml'\n"
" Timer { interval: 200; running: true; onTriggered: loader.source = '' }\n"
" }")
- , QUrl("file://" SRCDIR "/"));
+ , TEST_FILE(""));
QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
QVERIFY(loader != 0);
QVERIFY(loader->item());
@@ -153,7 +160,7 @@ void tst_QmlGraphicsLoader::clear()
delete loader;
}
{
- QmlComponent component(&engine, QUrl("file://" SRCDIR "/SetSourceComponent.qml"));
+ QmlComponent component(&engine, TEST_FILE("/SetSourceComponent.qml"));
QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(component.create());
QVERIFY(item);
@@ -183,7 +190,7 @@ void tst_QmlGraphicsLoader::urlToComponent()
" source: \"Rect120x60.qml\"\n"
" Timer { interval: 100; running: true; onTriggered: loader.sourceComponent = myComp }\n"
"}" )
- , QUrl("file://" SRCDIR "/"));
+ , TEST_FILE(""));
QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
QTest::qWait(500);
QVERIFY(loader != 0);
@@ -198,7 +205,7 @@ void tst_QmlGraphicsLoader::urlToComponent()
void tst_QmlGraphicsLoader::componentToUrl()
{
- QmlComponent component(&engine, QUrl("file://" SRCDIR "/SetSourceComponent.qml"));
+ QmlComponent component(&engine, TEST_FILE("/SetSourceComponent.qml"));
QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(component.create());
QVERIFY(item);
@@ -208,7 +215,7 @@ void tst_QmlGraphicsLoader::componentToUrl()
QCOMPARE(loader->progress(), 1.0);
QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
- loader->setSource(QUrl("file://" SRCDIR "/Rect120x60.qml"));
+ loader->setSource(TEST_FILE("/Rect120x60.qml"));
QVERIFY(loader->item());
QCOMPARE(loader->progress(), 1.0);
QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
@@ -220,7 +227,7 @@ void tst_QmlGraphicsLoader::componentToUrl()
void tst_QmlGraphicsLoader::sizeLoaderToItem()
{
- QmlComponent component(&engine, QUrl("file://" SRCDIR "/SizeToItem.qml"));
+ QmlComponent component(&engine, TEST_FILE("/SizeToItem.qml"));
QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
QVERIFY(loader != 0);
QVERIFY(loader->resizeMode() == QmlGraphicsLoader::SizeLoaderToItem);
@@ -245,7 +252,7 @@ void tst_QmlGraphicsLoader::sizeLoaderToItem()
void tst_QmlGraphicsLoader::sizeItemToLoader()
{
- QmlComponent component(&engine, QUrl("file://" SRCDIR "/SizeToLoader.qml"));
+ QmlComponent component(&engine, TEST_FILE("/SizeToLoader.qml"));
QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
QVERIFY(loader != 0);
QVERIFY(loader->resizeMode() == QmlGraphicsLoader::SizeItemToLoader);
@@ -266,7 +273,7 @@ void tst_QmlGraphicsLoader::sizeItemToLoader()
void tst_QmlGraphicsLoader::noResize()
{
- QmlComponent component(&engine, QUrl("file://" SRCDIR "/NoResize.qml"));
+ QmlComponent component(&engine, TEST_FILE("/NoResize.qml"));
QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
QVERIFY(loader != 0);
QCOMPARE(loader->width(), 200.0);
@@ -278,6 +285,46 @@ void tst_QmlGraphicsLoader::noResize()
QCOMPARE(rect->height(), 60.0);
}
+void tst_QmlGraphicsLoader::networkRequest()
+{
+ TestHTTPServer server(SERVER_PORT);
+ QVERIFY(server.isValid());
+ server.serveDirectory("data");
+
+ QmlComponent component(&engine, QByteArray("import Qt 4.6\nLoader { source: \"http://127.0.0.1:14445/Rect120x60.qml\" }"), TEST_FILE(""));
+ QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
+ QVERIFY(loader != 0);
+
+ TRY_WAIT(loader->status() == QmlGraphicsLoader::Ready);
+
+ QVERIFY(loader->item());
+ QCOMPARE(loader->progress(), 1.0);
+ QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
+
+ delete loader;
+}
+
+void tst_QmlGraphicsLoader::failNetworkRequest()
+{
+ TestHTTPServer server(SERVER_PORT);
+ QVERIFY(server.isValid());
+ server.serveDirectory("data");
+
+ QTest::ignoreMessage(QtWarningMsg, "(:-1: Network error for URL http://127.0.0.1:14445/IDontExist.qml) ");
+
+ QmlComponent component(&engine, QByteArray("import Qt 4.6\nLoader { source: \"http://127.0.0.1:14445/IDontExist.qml\" }"), TEST_FILE(""));
+ QmlGraphicsLoader *loader = qobject_cast<QmlGraphicsLoader*>(component.create());
+ QVERIFY(loader != 0);
+
+ TRY_WAIT(loader->status() == QmlGraphicsLoader::Error);
+
+ QVERIFY(loader->item() == 0);
+ QCOMPARE(loader->progress(), 0.0);
+ QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 0);
+
+ delete loader;
+}
+
QTEST_MAIN(tst_QmlGraphicsLoader)
#include "tst_qmlgraphicsloader.moc"
--
cgit v0.12
From a172096d8b3ef3b4acacda5e769d3713d8dab651 Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Mon, 16 Nov 2009 16:12:58 +1000
Subject: update Text visual test after change
946eab3e327bddcce10ed838462c0ca56ff011f0
---
.../qmlgraphicstext/font/data-MAC/plaintext.0.png | Bin 103018 -> 103018 bytes
.../qmlgraphicstext/font/data-MAC/plaintext.qml | 166 ++++++++++-----------
2 files changed, 83 insertions(+), 83 deletions(-)
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.0.png b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.0.png
index 05a6e51..67b497f 100644
Binary files a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.0.png and b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.0.png differ
diff --git a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.qml b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.qml
index 045dda0..ab17eb1 100644
--- a/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.qml
+++ b/tests/auto/declarative/visual/qmlgraphicstext/font/data-MAC/plaintext.qml
@@ -6,239 +6,239 @@ VisualTest {
}
Frame {
msec: 16
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 32
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 48
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 64
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 80
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 96
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 112
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 128
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 144
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 160
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 176
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 192
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 208
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 224
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 240
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 256
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 272
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 288
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 304
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 320
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 336
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 352
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 368
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 384
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 400
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 416
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 432
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 448
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 464
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 480
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 496
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 512
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 528
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 544
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 560
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 576
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 592
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 608
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 624
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 640
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 656
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 672
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 688
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 704
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 720
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 736
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 752
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 768
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 784
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 800
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 816
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 832
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 848
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 864
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 880
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 896
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 912
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 928
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 944
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 960
@@ -246,59 +246,59 @@ VisualTest {
}
Frame {
msec: 976
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 992
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 1008
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 1024
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 1040
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 1056
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 1072
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 1088
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 1104
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 1120
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 1136
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 1152
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 1168
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 1184
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Key {
type: 6
@@ -310,42 +310,42 @@ VisualTest {
}
Frame {
msec: 1200
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 1216
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 1232
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 1248
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 1264
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 1280
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 1296
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 1312
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 1328
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
Frame {
msec: 1344
- hash: "d6479cc04d67055c2fd8f4ed2fca829b"
+ hash: "cbf65bcb64a4781b79132b87f98d5fc7"
}
}
--
cgit v0.12