summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/declarative/.gitignore1
-rw-r--r--tests/auto/declarative/declarative.pro2
-rw-r--r--tests/auto/declarative/examples/examples.pro2
-rw-r--r--tests/auto/declarative/examples/tst_examples.cpp103
-rw-r--r--tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp4
-rw-r--r--tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp10
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp9
-rw-r--r--tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp8
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml8
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.errors.txt1
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.qml5
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml17
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp16
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp23
-rw-r--r--tests/auto/declarative/qdeclarativepositioners/data/grid-toptobottom.qml41
-rw-r--r--tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp32
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/data/README (renamed from tests/auto/declarative/sql/data/README)0
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/data/changeversion.js (renamed from tests/auto/declarative/sql/data/changeversion.js)0
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/data/creation-a.js (renamed from tests/auto/declarative/sql/data/creation-a.js)0
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/data/creation.js (renamed from tests/auto/declarative/sql/data/creation.js)0
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/data/error-a.js (renamed from tests/auto/declarative/sql/data/error-a.js)0
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/data/error-b.js (renamed from tests/auto/declarative/sql/data/error-b.js)0
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/data/error-creation.js (renamed from tests/auto/declarative/sql/data/error-creation.js)0
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/data/error-notransaction.js (renamed from tests/auto/declarative/sql/data/error-notransaction.js)0
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/data/error-outsidetransaction.js (renamed from tests/auto/declarative/sql/data/error-outsidetransaction.js)0
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/data/iteration-forwardonly.js (renamed from tests/auto/declarative/sql/data/iteration-forwardonly.js)0
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/data/iteration.js (renamed from tests/auto/declarative/sql/data/iteration.js)0
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/data/readonly-error.js (renamed from tests/auto/declarative/sql/data/readonly-error.js)0
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/data/readonly.js (renamed from tests/auto/declarative/sql/data/readonly.js)0
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/data/reopen1.js (renamed from tests/auto/declarative/sql/data/reopen1.js)0
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/data/reopen2.js (renamed from tests/auto/declarative/sql/data/reopen2.js)0
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/data/selection-bindnames.js (renamed from tests/auto/declarative/sql/data/selection-bindnames.js)0
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/data/selection.js (renamed from tests/auto/declarative/sql/data/selection.js)0
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro (renamed from tests/auto/declarative/sql/sql.pro)2
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp (renamed from tests/auto/declarative/sql/tst_sql.cpp)36
-rw-r--r--tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocal.qml5
-rw-r--r--tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocalError.qml5
-rw-r--r--tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemote.qml5
-rw-r--r--tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemoteError.qml5
-rw-r--r--tests/auto/declarative/qdeclarativetext/data/http/exists.pngbin0 -> 2738 bytes
-rw-r--r--tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro7
-rw-r--r--tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp69
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/data/returnValues.qml17
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/testtypes.h3
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp14
-rw-r--r--tests/auto/declarative/qmlvisual/Package_Views/packageviews.qml5
-rw-r--r--tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.0.png (renamed from tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.0.png)bin627 -> 627 bytes
-rw-r--r--tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.1.png (renamed from tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.1.png)bin626 -> 626 bytes
-rw-r--r--tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.2.png (renamed from tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.2.png)bin625 -> 625 bytes
-rw-r--r--tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.qml14
-rw-r--r--tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.0.png (renamed from tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.0.png)bin1418 -> 1418 bytes
-rw-r--r--tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.1.png (renamed from tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.1.png)bin1430 -> 1430 bytes
-rw-r--r--tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.2.png (renamed from tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.2.png)bin1431 -> 1431 bytes
-rw-r--r--tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.qml8
-rw-r--r--tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.1.pngbin98912 -> 98927 bytes
-rw-r--r--tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.qml110
-rw-r--r--tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.1.pngbin23029 -> 0 bytes
-rw-r--r--tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.2.pngbin23029 -> 0 bytes
-rw-r--r--tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.3.pngbin23029 -> 0 bytes
-rw-r--r--tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.4.pngbin23029 -> 0 bytes
-rw-r--r--tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.qml1350
-rw-r--r--tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml1
-rw-r--r--tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.qml (renamed from tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/repeater.qml)0
-rw-r--r--tests/auto/declarative/qmlvisual/qdeclarativepositioners/usingRepeater.qml (renamed from tests/auto/declarative/qmlvisual/qdeclarativepositioners/repeater.qml)0
-rw-r--r--tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp25
67 files changed, 419 insertions, 1546 deletions
diff --git a/tests/auto/declarative/.gitignore b/tests/auto/declarative/.gitignore
index d937eb4..57608cf 100644
--- a/tests/auto/declarative/.gitignore
+++ b/tests/auto/declarative/.gitignore
@@ -1,4 +1,5 @@
tst_*
!tst_*.*
+tst_*.log
tst_*.debug
tst_*~
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 5441311..7834650 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -62,7 +62,7 @@ SUBDIRS += \
qdeclarativexmlhttprequest \ # Cover
qdeclarativeimageprovider \ # Cover
qdeclarativestyledtext \ # Cover
- sql \ # Cover
+ qdeclarativesqldatabase \ # Cover
qmlvisual # Cover
contains(QT_CONFIG, webkit) {
diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro
index b316cb9..4c32524 100644
--- a/tests/auto/declarative/examples/examples.pro
+++ b/tests/auto/declarative/examples/examples.pro
@@ -4,6 +4,8 @@ macx:CONFIG -= app_bundle
SOURCES += tst_examples.cpp
+include(../../../../tools/qml/qml.pri)
+
DEFINES += SRCDIR=\\\"$$PWD\\\"
CONFIG += parallel_test
diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp
index e62aad2..c650346 100644
--- a/tests/auto/declarative/examples/tst_examples.cpp
+++ b/tests/auto/declarative/examples/tst_examples.cpp
@@ -43,8 +43,9 @@
#include <QDir>
#include <QProcess>
#include <QDebug>
-#include <QFutureSynchronizer>
-#include <QtConcurrentRun>
+#include "qmlruntime.h"
+#include <QDeclarativeView>
+#include <QDeclarativeError>
class tst_examples : public QObject
{
@@ -53,6 +54,7 @@ public:
tst_examples();
private slots:
+ void examples_data();
void examples();
void namingConvention();
@@ -173,8 +175,6 @@ QStringList tst_examples::findQmlFiles(const QDir &d)
return rv;
}
-
-
/*
This test runs all the examples in the declarative UI source tree and ensures
that they start and exit cleanly.
@@ -182,57 +182,9 @@ that they start and exit cleanly.
Examples are any .qml files under the examples/ or demos/ directory that start
with a lower case letter.
*/
-#define THREADS 5
-
-struct Example {
-public:
- Example() : result(Unknown) {}
-
- enum Result { Pass, Unknown, Fail };
- Result result;
- QString file;
- QString qmlruntime;
-
- void run();
-};
-
-void Example::run()
+void tst_examples::examples_data()
{
- QFileInfo fi(file);
- QFileInfo dir(fi.path());
- QString script = SRCDIR "/data/"+dir.baseName()+"/"+fi.baseName();
- QFileInfo testdata(script+".qml");
- QStringList arguments;
- arguments << "-script" << (testdata.exists() ? script : QLatin1String(SRCDIR "/data/dummytest"))
- << "-scriptopts" << "play,testerror,exitoncomplete,exitonfailure"
- << file;
-#ifdef Q_WS_QWS
- arguments << "-qws";
-#endif
-
- QProcess p;
- p.start(qmlruntime, arguments);
- if (!p.waitForFinished()) {
- result = Fail;
- return;
- }
-
- if (p.exitStatus() != QProcess::NormalExit || p.exitCode() != 0)
- qWarning() << p.readAllStandardOutput() << p.readAllStandardError();
-
- if (p.exitStatus() != QProcess::NormalExit ||
- p.exitCode() != 0) {
- result = Fail;
- return;
- } else {
- result = Pass;
- return;
- }
-}
-
-void tst_examples::examples()
-{
- QThreadPool::globalInstance()->setMaxThreadCount(5);
+ QTest::addColumn<QString>("file");
QString examples = QLatin1String(SRCDIR) + "/../../../../demos/declarative/";
QString demos = QLatin1String(SRCDIR) + "/../../../../examples/declarative/";
@@ -243,38 +195,31 @@ void tst_examples::examples()
files << findQmlFiles(QDir(demos));
files << findQmlFiles(QDir(snippets));
- QList<Example> tests;
-
- for (int ii = 0; ii < files.count(); ++ii) {
- Example e;
- e.file = files.at(ii);
- e.qmlruntime = qmlruntime;
- tests << e;
- }
+ foreach (const QString &file, files)
+ QTest::newRow(qPrintable(file)) << file;
+}
- QFutureSynchronizer<void> sync;
+static void silentErrorsMsgHandler(QtMsgType, const char *)
+{
+}
- for (int ii = 0; ii < tests.count(); ++ii) {
- Example *e = &tests[ii];
- QFuture<void> r = QtConcurrent::run(e, &Example::run);
- sync.addFuture(r);
- }
+void tst_examples::examples()
+{
+ QFETCH(QString, file);
- sync.waitForFinished();
+ QDeclarativeViewer viewer;
- QStringList failures;
- for (int ii = 0; ii < tests.count(); ++ii) {
- if (tests.at(ii).result != Example::Pass)
- failures << QDir::cleanPath(tests.at(ii).file);
- }
+ QtMsgHandler old = qInstallMsgHandler(silentErrorsMsgHandler);
+ QVERIFY(viewer.open(file));
+ qInstallMsgHandler(old);
- if (failures.count()) {
- QString error("Failed examples: ");
- error += failures.join(", ");
+ if (viewer.view()->status() == QDeclarativeView::Error)
+ qWarning() << viewer.view()->errors();
- QFAIL(qPrintable(error));
- }
+ QCOMPARE(viewer.view()->status(), QDeclarativeView::Ready);
+ viewer.show();
+ QTest::qWaitForWindowShown(&viewer);
}
QTEST_MAIN(tst_examples)
diff --git a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
index 0f03527..8621239 100644
--- a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
+++ b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
@@ -121,10 +121,10 @@ void tst_qdeclarativeborderimage::imageSource_data()
QTest::newRow("local") << QUrl::fromLocalFile(SRCDIR "/data/colors.png").toString() << false << "";
QTest::newRow("local not found") << QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString() << false
- << "Cannot open QUrl( \"" + QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString() + "\" ) ";
+ << "QML BorderImage (file::2:1) Cannot open: " + QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString();
QTest::newRow("remote") << SERVER_ADDR "/colors.png" << true << "";
QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << true
- << "\"Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found\" ";
+ << "QML BorderImage (file::2:1) Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found";
}
void tst_qdeclarativeborderimage::imageSource()
diff --git a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
index 35cffdc..851460f 100644
--- a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
+++ b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
@@ -172,8 +172,8 @@ void tst_qdeclarativecontext::parentContext()
delete ctxt2; ctxt2 = 0;
QCOMPARE(ctxt->parentContext(), engine->rootContext());
- QCOMPARE(ctxt3->parentContext(), ctxt2);
- QCOMPARE(ctxt4->parentContext(), ctxt2);
+ QCOMPARE(ctxt3->parentContext(), (QDeclarativeContext *)0);
+ QCOMPARE(ctxt4->parentContext(), (QDeclarativeContext *)0);
QCOMPARE(ctxt5->parentContext(), ctxt);
QCOMPARE(ctxt6->parentContext(), engine->rootContext());
QCOMPARE(ctxt7->parentContext(), engine->rootContext());
@@ -181,9 +181,9 @@ void tst_qdeclarativecontext::parentContext()
delete engine; engine = 0;
QCOMPARE(ctxt->parentContext(), (QDeclarativeContext *)0);
- QCOMPARE(ctxt3->parentContext(), ctxt2);
- QCOMPARE(ctxt4->parentContext(), ctxt2);
- QCOMPARE(ctxt5->parentContext(), ctxt);
+ QCOMPARE(ctxt3->parentContext(), (QDeclarativeContext *)0);
+ QCOMPARE(ctxt4->parentContext(), (QDeclarativeContext *)0);
+ QCOMPARE(ctxt5->parentContext(), (QDeclarativeContext *)0);
QCOMPARE(ctxt6->parentContext(), (QDeclarativeContext *)0);
QCOMPARE(ctxt7->parentContext(), (QDeclarativeContext *)0);
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 35b4d99..098ac36 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -1382,7 +1382,6 @@ void tst_qdeclarativeecmascript::callQtInvokables()
o.reset();
{
QScriptValue ret = engine->evaluate("object.method_NoArgs_QPointF()");
- QVERIFY(ret.isVariant());
QCOMPARE(ret.toVariant(), QVariant(QPointF(123, 4.5)));
QCOMPARE(o.error(), false);
QCOMPARE(o.invoked(), 3);
diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
index 53c208e..854bcdd 100644
--- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
+++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
@@ -124,13 +124,14 @@ void tst_qdeclarativeimage::imageSource_data()
QTest::newRow("local") << QUrl::fromLocalFile(SRCDIR "/data/colors.png").toString() << 120.0 << 120.0 << false << false << "";
QTest::newRow("local async") << QUrl::fromLocalFile(SRCDIR "/data/colors1.png").toString() << 120.0 << 120.0 << false << true << "";
QTest::newRow("local not found") << QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString() << 0.0 << 0.0 << false
- << false << "Cannot open QUrl( \"" + QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString() + "\" ) ";
+ << false << "QML Image (file::2:1) Cannot open: " + QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString();
QTest::newRow("local async not found") << QUrl::fromLocalFile(SRCDIR "/data/no-such-file-1.png").toString() << 0.0 << 0.0 << false
- << true << "\"Cannot open: " + QUrl::fromLocalFile(SRCDIR "/data/no-such-file-1.png").toString() + "\" ";
+ << true << "QML Image (file::2:1) Cannot open: " + QUrl::fromLocalFile(SRCDIR "/data/no-such-file-1.png").toString();
QTest::newRow("remote") << SERVER_ADDR "/colors.png" << 120.0 << 120.0 << true << false << "";
QTest::newRow("remote svg") << SERVER_ADDR "/heart.svg" << 550.0 << 500.0 << true << false << "";
- QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << 0.0 << 0.0 << true << false
- << "\"Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found\" ";
+ QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << 0.0 << 0.0 << true
+ << false << "QML Image (file::2:1) Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found";
+
}
void tst_qdeclarativeimage::imageSource()
diff --git a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
index 162c266..aca951b 100644
--- a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
+++ b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
@@ -96,9 +96,10 @@ void tst_qdeclarativeimageprovider::imageSource_data()
QTest::newRow("exists") << "image://test/exists.png" << "" << QSize(100,100) << "";
QTest::newRow("scaled") << "image://test/exists.png" << "sourceSize: \"80x30\"" << QSize(80,30) << "";
QTest::newRow("missing") << "image://test/no-such-file.png" << "" << QSize()
- << "\"Failed to get image from provider: image://test/no-such-file.png\" ";
+ << "QML Image (file::2:1) Failed to get image from provider: image://test/no-such-file.png";
QTest::newRow("unknown provider") << "image://bogus/exists.png" << "" << QSize()
- << "\"Failed to get image from provider: image://bogus/exists.png\" ";
+ << "QML Image (file::2:1) Failed to get image from provider: image://bogus/exists.png";
+
}
void tst_qdeclarativeimageprovider::imageSource()
@@ -157,7 +158,8 @@ void tst_qdeclarativeimageprovider::removeProvider()
QCOMPARE(obj->width(), 100.0);
// remove the provider and confirm
- QString error("\"Failed to get image from provider: image://test2/exists2.png\" ");
+ QString error("QML Image (file::2:1) Failed to get image from provider: image://test2/exists2.png");
+
QTest::ignoreMessage(QtWarningMsg, error.toUtf8());
engine.removeImageProvider("test2");
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml b/tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml
new file mode 100644
index 0000000..e5a7cf8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml
@@ -0,0 +1,8 @@
+import Test 1.0
+import Qt 4.6
+
+MyQmlObject {
+ property int a: Math.max(10, 9)
+ property int b: 11
+ Component.onDestruction: console.log("Destruction " + a + " " + b);
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.errors.txt
new file mode 100644
index 0000000..3348494
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.errors.txt
@@ -0,0 +1 @@
+4:5:Cannot assign to non-existent property "onDestroyed"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.qml b/tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.qml
new file mode 100644
index 0000000..4eab50a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+QtObject {
+ onDestroyed: print("Hello World!")
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml b/tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml
new file mode 100644
index 0000000..7ebae7b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml
@@ -0,0 +1,17 @@
+import Test 1.0
+import Qt 4.6
+
+MyTypeObject {
+ // We set a and b to ensure that onCompleted is executed after bindings and
+ // constants have been assigned
+ property int a: Math.min(6, 7)
+ Component.onDestruction: console.log("Destruction " + a + " " + nestedObject.b)
+
+ objectProperty: OnDestructionType {
+ qmlobjectProperty: MyQmlObject {
+ id: nestedObject
+ property int b: 10
+ Component.onDestruction: console.log("Destruction " + a + " " + nestedObject.b)
+ }
+ }
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index 7c327c2..8feab32 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -113,6 +113,7 @@ private slots:
void i18n();
void i18n_data();
void onCompleted();
+ void onDestruction();
void scriptString();
void defaultPropertyListOrder();
void declaredPropertyValues();
@@ -329,6 +330,7 @@ void tst_qdeclarativelanguage::errors_data()
QTest::newRow("missingValueTypeProperty") << "missingValueTypeProperty.qml" << "missingValueTypeProperty.errors.txt" << false;
QTest::newRow("objectValueTypeProperty") << "objectValueTypeProperty.qml" << "objectValueTypeProperty.errors.txt" << false;
QTest::newRow("enumTypes") << "enumTypes.qml" << "enumTypes.errors.txt" << false;
+ QTest::newRow("destroyedSignal") << "destroyedSignal.qml" << "destroyedSignal.errors.txt" << false;
}
@@ -1049,6 +1051,20 @@ void tst_qdeclarativelanguage::onCompleted()
QVERIFY(object != 0);
}
+// Check that the Component::onDestruction attached property works
+void tst_qdeclarativelanguage::onDestruction()
+{
+ QDeclarativeComponent component(&engine, TEST_FILE("onDestruction.qml"));
+ VERIFY_ERRORS(0);
+ QObject *object = component.create();
+ QVERIFY(object != 0);
+
+ QTest::ignoreMessage(QtDebugMsg, "Destruction 6 10");
+ QTest::ignoreMessage(QtDebugMsg, "Destruction 6 10");
+ QTest::ignoreMessage(QtDebugMsg, "Destruction 10 11");
+ delete object;
+}
+
// Check that assignments to QDeclarativeScriptString properties work
void tst_qdeclarativelanguage::scriptString()
{
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
index 26199d3..6d17acc 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
@@ -101,7 +101,6 @@ inline QUrl TEST_FILE(const QString &filename)
void tst_qdeclarativemoduleplugin::importsPlugin()
{
-QSKIP("Fix me", SkipAll);
QDeclarativeEngine engine;
engine.addImportPath(QLatin1String(SRCDIR) + QDir::separator() + QLatin1String("imports"));
QTest::ignoreMessage(QtWarningMsg, "plugin created");
diff --git a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
index f2ccf80..0cc13ad 100644
--- a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
+++ b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
@@ -126,19 +126,20 @@ void tst_qdeclarativepixmapcache::single()
QFETCH(bool, exists);
QFETCH(bool, neterror);
+ QString expectedError;
if (neterror) {
- QString expected = "\"Error downloading " + target.toString() + " - server replied: Not found\" ";
- QTest::ignoreMessage(QtWarningMsg, expected.toLatin1());
+ expectedError = "Error downloading " + target.toString() + " - server replied: Not found";
} else if (!exists) {
- QString expected = "Cannot open QUrl( \"" + target.toString() + "\" ) ";
- QTest::ignoreMessage(QtWarningMsg, expected.toLatin1());
+ expectedError = "Cannot open: " + target.toString();
}
QPixmap pixmap;
QVERIFY(pixmap.width() <= 0); // Check Qt assumption
- QDeclarativePixmapReply::Status status = QDeclarativePixmapCache::get(target, &pixmap);
+ QString errorString;
+ QDeclarativePixmapReply::Status status = QDeclarativePixmapCache::get(target, &pixmap, &errorString);
if (incache) {
+ QCOMPARE(errorString, expectedError);
if (exists) {
QVERIFY(status == QDeclarativePixmapReply::Ready);
QVERIFY(pixmap.width() > 0);
@@ -156,13 +157,15 @@ void tst_qdeclarativepixmapcache::single()
QTestEventLoop::instance().enterLoop(10);
QVERIFY(!QTestEventLoop::instance().timeout());
QVERIFY(getter.gotslot);
+ QString errorString;
if (exists) {
- QVERIFY(QDeclarativePixmapCache::get(target, &pixmap) == QDeclarativePixmapReply::Ready);
+ QVERIFY(QDeclarativePixmapCache::get(target, &pixmap, &errorString) == QDeclarativePixmapReply::Ready);
QVERIFY(pixmap.width() > 0);
} else {
- QVERIFY(QDeclarativePixmapCache::get(target, &pixmap) == QDeclarativePixmapReply::Error);
+ QVERIFY(QDeclarativePixmapCache::get(target, &pixmap, &errorString) == QDeclarativePixmapReply::Error);
QVERIFY(pixmap.width() <= 0);
}
+ QCOMPARE(errorString, expectedError);
}
QCOMPARE(QDeclarativePixmapCache::pendingRequests(), 0);
@@ -236,7 +239,8 @@ void tst_qdeclarativepixmapcache::parallel()
for (int i=0; i<targets.count(); ++i) {
QUrl target = targets.at(i);
QPixmap pixmap;
- QDeclarativePixmapReply::Status status = QDeclarativePixmapCache::get(target, &pixmap);
+ QString errorString;
+ QDeclarativePixmapReply::Status status = QDeclarativePixmapCache::get(target, &pixmap, &errorString);
QDeclarativePixmapReply *reply = 0;
QVERIFY(status != QDeclarativePixmapReply::Error);
if (status != QDeclarativePixmapReply::Error && status != QDeclarativePixmapReply::Ready)
@@ -273,7 +277,8 @@ void tst_qdeclarativepixmapcache::parallel()
} else {
QVERIFY(getters[i]->gotslot);
QPixmap pixmap;
- QVERIFY(QDeclarativePixmapCache::get(targets[i], &pixmap) == QDeclarativePixmapReply::Ready);
+ QString errorString;
+ QVERIFY(QDeclarativePixmapCache::get(targets[i], &pixmap, &errorString) == QDeclarativePixmapReply::Ready);
QVERIFY(pixmap.width() > 0);
}
delete getters[i];
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/grid-toptobottom.qml b/tests/auto/declarative/qdeclarativepositioners/data/grid-toptobottom.qml
new file mode 100644
index 0000000..34a84bf
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepositioners/data/grid-toptobottom.qml
@@ -0,0 +1,41 @@
+import Qt 4.6
+
+Item {
+ width: 640
+ height: 480
+ Grid {
+ objectName: "grid"
+ rows: 3
+ flow: Grid.TopToBottom
+ Rectangle {
+ objectName: "one"
+ color: "red"
+ width: 50
+ height: 50
+ }
+ Rectangle {
+ objectName: "two"
+ color: "green"
+ width: 20
+ height: 50
+ }
+ Rectangle {
+ objectName: "three"
+ color: "blue"
+ width: 50
+ height: 20
+ }
+ Rectangle {
+ objectName: "four"
+ color: "cyan"
+ width: 50
+ height: 50
+ }
+ Rectangle {
+ objectName: "five"
+ color: "magenta"
+ width: 10
+ height: 10
+ }
+ }
+}
diff --git a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
index 8692596..b4ac0e1 100644
--- a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
+++ b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
@@ -61,6 +61,7 @@ private slots:
void test_vertical_spacing();
void test_vertical_animated();
void test_grid();
+ void test_grid_topToBottom();
void test_grid_spacing();
void test_grid_animated();
void test_grid_zero_columns();
@@ -305,6 +306,37 @@ void tst_QDeclarativePositioners::test_grid()
QCOMPARE(grid->height(), 100.0);
}
+void tst_QDeclarativePositioners::test_grid_topToBottom()
+{
+ QDeclarativeView *canvas = createView(SRCDIR "/data/grid-toptobottom.qml");
+
+ QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+ QVERIFY(one != 0);
+ QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+ QVERIFY(two != 0);
+ QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+ QVERIFY(three != 0);
+ QDeclarativeRectangle *four = canvas->rootObject()->findChild<QDeclarativeRectangle*>("four");
+ QVERIFY(four != 0);
+ QDeclarativeRectangle *five = canvas->rootObject()->findChild<QDeclarativeRectangle*>("five");
+ QVERIFY(five != 0);
+
+ QCOMPARE(one->x(), 0.0);
+ QCOMPARE(one->y(), 0.0);
+ QCOMPARE(two->x(), 0.0);
+ QCOMPARE(two->y(), 50.0);
+ QCOMPARE(three->x(), 0.0);
+ QCOMPARE(three->y(), 100.0);
+ QCOMPARE(four->x(), 50.0);
+ QCOMPARE(four->y(), 0.0);
+ QCOMPARE(five->x(), 50.0);
+ QCOMPARE(five->y(), 50.0);
+
+ QDeclarativeItem *grid = canvas->rootObject()->findChild<QDeclarativeItem*>("grid");
+ QCOMPARE(grid->width(), 100.0);
+ QCOMPARE(grid->height(), 120.0);
+}
+
void tst_QDeclarativePositioners::test_grid_spacing()
{
QDeclarativeView *canvas = createView(SRCDIR "/data/grid-spacing.qml");
diff --git a/tests/auto/declarative/sql/data/README b/tests/auto/declarative/qdeclarativesqldatabase/data/README
index 7efca3a..7efca3a 100644
--- a/tests/auto/declarative/sql/data/README
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/README
diff --git a/tests/auto/declarative/sql/data/changeversion.js b/tests/auto/declarative/qdeclarativesqldatabase/data/changeversion.js
index 680d7a6..680d7a6 100644
--- a/tests/auto/declarative/sql/data/changeversion.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/changeversion.js
diff --git a/tests/auto/declarative/sql/data/creation-a.js b/tests/auto/declarative/qdeclarativesqldatabase/data/creation-a.js
index bd7d5c5..bd7d5c5 100644
--- a/tests/auto/declarative/sql/data/creation-a.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/creation-a.js
diff --git a/tests/auto/declarative/sql/data/creation.js b/tests/auto/declarative/qdeclarativesqldatabase/data/creation.js
index 317b4c1..317b4c1 100644
--- a/tests/auto/declarative/sql/data/creation.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/creation.js
diff --git a/tests/auto/declarative/sql/data/error-a.js b/tests/auto/declarative/qdeclarativesqldatabase/data/error-a.js
index 10a23f6..10a23f6 100644
--- a/tests/auto/declarative/sql/data/error-a.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/error-a.js
diff --git a/tests/auto/declarative/sql/data/error-b.js b/tests/auto/declarative/qdeclarativesqldatabase/data/error-b.js
index 4dd0ecf..4dd0ecf 100644
--- a/tests/auto/declarative/sql/data/error-b.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/error-b.js
diff --git a/tests/auto/declarative/sql/data/error-creation.js b/tests/auto/declarative/qdeclarativesqldatabase/data/error-creation.js
index 0ab2a35..0ab2a35 100644
--- a/tests/auto/declarative/sql/data/error-creation.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/error-creation.js
diff --git a/tests/auto/declarative/sql/data/error-notransaction.js b/tests/auto/declarative/qdeclarativesqldatabase/data/error-notransaction.js
index b9cc647..b9cc647 100644
--- a/tests/auto/declarative/sql/data/error-notransaction.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/error-notransaction.js
diff --git a/tests/auto/declarative/sql/data/error-outsidetransaction.js b/tests/auto/declarative/qdeclarativesqldatabase/data/error-outsidetransaction.js
index a7af3bd..a7af3bd 100644
--- a/tests/auto/declarative/sql/data/error-outsidetransaction.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/error-outsidetransaction.js
diff --git a/tests/auto/declarative/sql/data/iteration-forwardonly.js b/tests/auto/declarative/qdeclarativesqldatabase/data/iteration-forwardonly.js
index 45947c0..45947c0 100644
--- a/tests/auto/declarative/sql/data/iteration-forwardonly.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/iteration-forwardonly.js
diff --git a/tests/auto/declarative/sql/data/iteration.js b/tests/auto/declarative/qdeclarativesqldatabase/data/iteration.js
index c34cbbb..c34cbbb 100644
--- a/tests/auto/declarative/sql/data/iteration.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/iteration.js
diff --git a/tests/auto/declarative/sql/data/readonly-error.js b/tests/auto/declarative/qdeclarativesqldatabase/data/readonly-error.js
index 69ec67f..69ec67f 100644
--- a/tests/auto/declarative/sql/data/readonly-error.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/readonly-error.js
diff --git a/tests/auto/declarative/sql/data/readonly.js b/tests/auto/declarative/qdeclarativesqldatabase/data/readonly.js
index 5ee862c..5ee862c 100644
--- a/tests/auto/declarative/sql/data/readonly.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/readonly.js
diff --git a/tests/auto/declarative/sql/data/reopen1.js b/tests/auto/declarative/qdeclarativesqldatabase/data/reopen1.js
index c1a8157..c1a8157 100644
--- a/tests/auto/declarative/sql/data/reopen1.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/reopen1.js
diff --git a/tests/auto/declarative/sql/data/reopen2.js b/tests/auto/declarative/qdeclarativesqldatabase/data/reopen2.js
index 4f7248f..4f7248f 100644
--- a/tests/auto/declarative/sql/data/reopen2.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/reopen2.js
diff --git a/tests/auto/declarative/sql/data/selection-bindnames.js b/tests/auto/declarative/qdeclarativesqldatabase/data/selection-bindnames.js
index 9786821..9786821 100644
--- a/tests/auto/declarative/sql/data/selection-bindnames.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/selection-bindnames.js
diff --git a/tests/auto/declarative/sql/data/selection.js b/tests/auto/declarative/qdeclarativesqldatabase/data/selection.js
index f116eff..f116eff 100644
--- a/tests/auto/declarative/sql/data/selection.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/selection.js
diff --git a/tests/auto/declarative/sql/sql.pro b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
index 7e4fdd8..3ff4529 100644
--- a/tests/auto/declarative/sql/sql.pro
+++ b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
@@ -3,7 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative
QT += sql script
macx:CONFIG -= app_bundle
-SOURCES += tst_sql.cpp
+SOURCES += tst_qdeclarativesqldatabase.cpp
# Define SRCDIR equal to test's source directory
DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/sql/tst_sql.cpp b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp
index c8b8dc3..7486a4b 100644
--- a/tests/auto/declarative/sql/tst_sql.cpp
+++ b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp
@@ -53,19 +53,19 @@
#include <QtCore/qdir.h>
#include <QtCore/qfile.h>
-class tst_sql : public QObject
+class tst_qdeclarativesqldatabase : public QObject
{
Q_OBJECT
public:
- tst_sql()
+ tst_qdeclarativesqldatabase()
{
- qApp->setApplicationName("tst_sql");
+ qApp->setApplicationName("tst_qdeclarativesqldatabase");
qApp->setOrganizationName("Nokia");
qApp->setOrganizationDomain("nokia.com");
engine = new QDeclarativeEngine;
}
- ~tst_sql()
+ ~tst_qdeclarativesqldatabase()
{
delete engine;
}
@@ -108,33 +108,33 @@ void removeRecursive(const QString& dirname)
QDir().rmdir(dirname);
}
-void tst_sql::initTestCase()
+void tst_qdeclarativesqldatabase::initTestCase()
{
removeRecursive(dbDir());
QDir().mkpath(dbDir());
}
-void tst_sql::cleanupTestCase()
+void tst_qdeclarativesqldatabase::cleanupTestCase()
{
removeRecursive(dbDir());
}
-QString tst_sql::dbDir() const
+QString tst_qdeclarativesqldatabase::dbDir() const
{
- static QString tmpd = QDir::tempPath()+"/tst_sql_output-"
+ static QString tmpd = QDir::tempPath()+"/tst_qdeclarativesqldatabase_output-"
+ QDateTime::currentDateTime().toString(QLatin1String("yyyyMMddhhmmss"));
return tmpd;
}
-void tst_sql::checkDatabasePath()
+void tst_qdeclarativesqldatabase::checkDatabasePath()
{
// Check default storage path (we can't use it since we don't want to mess with user's data)
- QVERIFY(engine->offlineStoragePath().contains("tst_sql"));
+ QVERIFY(engine->offlineStoragePath().contains("tst_qdeclarativesqldatabase"));
QVERIFY(engine->offlineStoragePath().contains("OfflineStorage"));
}
static const int total_databases_created_by_tests = 12;
-void tst_sql::testQml_data()
+void tst_qdeclarativesqldatabase::testQml_data()
{
QTest::addColumn<QString>("jsfile"); // The input file
@@ -161,7 +161,7 @@ void tst_sql::testQml_data()
}
/*
-void tst_sql::validateAgainstWebkit()
+void tst_qdeclarativesqldatabase::validateAgainstWebkit()
{
// Validates tests against WebKit (HTML5) support.
//
@@ -188,7 +188,7 @@ void tst_sql::validateAgainstWebkit()
}
*/
-void tst_sql::testQml()
+void tst_qdeclarativesqldatabase::testQml()
{
// Tests QML SQL Database support with tests
// that have been validated against Webkit.
@@ -209,7 +209,7 @@ void tst_sql::testQml()
QCOMPARE(text->text(),QString("passed"));
}
-void tst_sql::testQml_cleanopen_data()
+void tst_qdeclarativesqldatabase::testQml_cleanopen_data()
{
QTest::addColumn<QString>("jsfile"); // The input file
QTest::newRow("reopen1") << "data/reopen1.js";
@@ -217,7 +217,7 @@ void tst_sql::testQml_cleanopen_data()
QTest::newRow("error-creation") << "data/error-creation.js"; // re-uses creation DB
}
-void tst_sql::testQml_cleanopen()
+void tst_qdeclarativesqldatabase::testQml_cleanopen()
{
// Same as testQml, but clean connections between tests,
// making it more like the tests are running in new processes.
@@ -229,11 +229,11 @@ void tst_sql::testQml_cleanopen()
}
}
-void tst_sql::totalDatabases()
+void tst_qdeclarativesqldatabase::totalDatabases()
{
QCOMPARE(QDir(dbDir()+"/Databases").entryInfoList(QDir::Files|QDir::NoDotAndDotDot).count(), total_databases_created_by_tests*2);
}
-QTEST_MAIN(tst_sql)
+QTEST_MAIN(tst_qdeclarativesqldatabase)
-#include "tst_sql.moc"
+#include "tst_qdeclarativesqldatabase.moc"
diff --git a/tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocal.qml b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocal.qml
new file mode 100644
index 0000000..5aeea56
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocal.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+Text {
+ text: "<img src='http/exists.png'>"
+}
diff --git a/tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocalError.qml b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocalError.qml
new file mode 100644
index 0000000..17bb21c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocalError.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+Text {
+ text: "<img src='http/notexists.png'>"
+}
diff --git a/tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemote.qml b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemote.qml
new file mode 100644
index 0000000..53b0266
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemote.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+Text {
+ text: "<img src='http://127.0.0.1:14453/exists.png'>"
+}
diff --git a/tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemoteError.qml b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemoteError.qml
new file mode 100644
index 0000000..48c7a95
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemoteError.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+Text {
+ text: "<img src='http://127.0.0.1:14453/notexists.png'>"
+}
diff --git a/tests/auto/declarative/qdeclarativetext/data/http/exists.png b/tests/auto/declarative/qdeclarativetext/data/http/exists.png
new file mode 100644
index 0000000..399bd0b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetext/data/http/exists.png
Binary files differ
diff --git a/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro
index 73c05b5..e70443e 100644
--- a/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro
+++ b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro
@@ -1,8 +1,15 @@
load(qttest_p4)
contains(QT_CONFIG,declarative): QT += declarative gui
+QT += network
macx:CONFIG -= app_bundle
SOURCES += tst_qdeclarativetext.cpp
+INCLUDEPATH += ../shared/
+HEADERS += ../shared/testhttpserver.h
+SOURCES += ../shared/testhttpserver.cpp
+
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+
CONFIG += parallel_test
diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
index 2d10756..edb4a32 100644
--- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
+++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
@@ -48,6 +48,9 @@
#include <QGraphicsSceneMouseEvent>
#include <qmath.h>
+#include "../../../shared/util.h"
+#include "testhttpserver.h"
+
class tst_qdeclarativetext : public QObject
{
@@ -62,6 +65,9 @@ private slots:
void elide();
void textFormat();
+ void embeddedImages_data();
+ void embeddedImages();
+
// ### these tests may be trivial
void horizontalAlignment();
void verticalAlignment();
@@ -286,8 +292,28 @@ void tst_qdeclarativetext::wrap()
QVERIFY(textObject != 0);
QCOMPARE(textObject->width(), 30.);
QVERIFY(textObject->height() > textHeight);
+
+ qreal oldHeight = textObject->height();
+ textObject->setWidth(100);
+ QVERIFY(textObject->height() < oldHeight);
}
+ // richtext again with a fixed height
+ for (int i = 0; i < richText.size(); i++)
+ {
+ QString componentStr = "import Qt 4.7\nText { wrapMode: Text.WordWrap; width: 30; height: 50; text: \"" + richText.at(i) + "\" }";
+ QDeclarativeComponent textComponent(&engine);
+ textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+ QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+ QVERIFY(textObject != 0);
+ QCOMPARE(textObject->width(), 30.);
+ QVERIFY(textObject->implicitHeight() > textHeight);
+
+ qreal oldHeight = textObject->implicitHeight();
+ textObject->setWidth(100);
+ QVERIFY(textObject->implicitHeight() < oldHeight);
+ }
}
void tst_qdeclarativetext::elide()
@@ -839,6 +865,49 @@ void tst_qdeclarativetext::clickLink()
}
}
+void tst_qdeclarativetext::embeddedImages_data()
+{
+ QTest::addColumn<QUrl>("qmlfile");
+ QTest::addColumn<QString>("error");
+ QTest::newRow("local") << QUrl::fromLocalFile(SRCDIR "/data/embeddedImagesLocal.qml") << "";
+ QTest::newRow("local-error") << QUrl::fromLocalFile(SRCDIR "/data/embeddedImagesLocalError.qml")
+ << "QML Text ("+QUrl::fromLocalFile(SRCDIR "/data/embeddedImagesLocalError.qml").toString()+":3:1) Cannot open: " + QUrl::fromLocalFile(SRCDIR "/data/http/notexists.png").toString();
+ QTest::newRow("remote") << QUrl::fromLocalFile(SRCDIR "/data/embeddedImagesRemote.qml") << "";
+ QTest::newRow("remote-error") << QUrl::fromLocalFile(SRCDIR "/data/embeddedImagesRemoteError.qml")
+ << "QML Text ("+QUrl::fromLocalFile(SRCDIR "/data/embeddedImagesRemoteError.qml").toString()+":3:1) Error downloading http://127.0.0.1:14453/notexists.png - server replied: Not found";
+}
+
+void tst_qdeclarativetext::embeddedImages()
+{
+ // Tests QTBUG-9900
+
+ QFETCH(QUrl, qmlfile);
+ QFETCH(QString, error);
+
+ TestHTTPServer server(14453);
+ server.serveDirectory(SRCDIR "/data/http");
+
+ if (!error.isEmpty())
+ QTest::ignoreMessage(QtWarningMsg, error.toLatin1());
+
+ QDeclarativeComponent textComponent(&engine, qmlfile);
+ QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+ QVERIFY(textObject != 0);
+
+ QTRY_COMPARE(textObject->resourcesLoading(), 0);
+
+ QPixmap pm(SRCDIR "/data/http/exists.png");
+ if (error.isEmpty()) {
+ QCOMPARE(textObject->width(), double(pm.width()));
+ QCOMPARE(textObject->height(), double(pm.height()));
+ } else {
+ QVERIFY(16 != pm.width()); // check test is effective
+ QCOMPARE(textObject->width(), 16.0); // default size of QTextDocument broken image icon
+ QCOMPARE(textObject->height(), 16.0);
+ }
+}
+
QTEST_MAIN(tst_qdeclarativetext)
#include "tst_qdeclarativetext.moc"
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/returnValues.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/returnValues.qml
new file mode 100644
index 0000000..185e7ba
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativevaluetypes/data/returnValues.qml
@@ -0,0 +1,17 @@
+import Test 1.0
+import Qt 4.6
+
+MyTypeObject {
+ property bool test1: false;
+ property bool test2: false;
+
+ Component.onCompleted: {
+ var a = method();
+
+ test1 = (a.width == 13)
+ test2 = (a.height == 14)
+
+ size = a;
+ }
+}
+
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
index 9057b4f..dd13429 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
+++ b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h
@@ -129,6 +129,9 @@ public:
signals:
void changed();
void runScript();
+
+public slots:
+ QSize method() { return QSize(13, 14); }
};
QML_DECLARE_TYPE(MyTypeObject);
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
index e653abf..b733b10 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
+++ b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
@@ -79,6 +79,7 @@ private slots:
void cppClasses();
void enums();
void conflictingBindings();
+ void returnValues();
private:
QDeclarativeEngine engine;
@@ -763,6 +764,19 @@ void tst_qdeclarativevaluetypes::conflictingBindings()
}
}
+void tst_qdeclarativevaluetypes::returnValues()
+{
+ QDeclarativeComponent component(&engine, TEST_FILE("returnValues.qml"));
+ QObject *object = component.create();
+ QVERIFY(object != 0);
+
+ QCOMPARE(object->property("test1").toBool(), true);
+ QCOMPARE(object->property("test2").toBool(), true);
+ QCOMPARE(object->property("size").toSize(), QSize(13, 14));
+
+ delete object;
+}
+
QTEST_MAIN(tst_qdeclarativevaluetypes)
#include "tst_qdeclarativevaluetypes.moc"
diff --git a/tests/auto/declarative/qmlvisual/Package_Views/packageviews.qml b/tests/auto/declarative/qmlvisual/Package_Views/packageviews.qml
index f6c033f..7ccba10 100644
--- a/tests/auto/declarative/qmlvisual/Package_Views/packageviews.qml
+++ b/tests/auto/declarative/qmlvisual/Package_Views/packageviews.qml
@@ -63,8 +63,9 @@ Rectangle {
Transition {
from: "*"; to: "*"
SequentialAnimation {
- ParentAction{}
- NumberAnimation { properties: "x,y,width"; easing.type: "InOutQuad" }
+ ParentAnimation{
+ NumberAnimation { properties: "x,y,width"; easing.type: "InOutQuad" }
+ }
}
}
]
diff --git a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.0.png b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.0.png
index e6ea16d..e6ea16d 100644
--- a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.0.png
+++ b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.0.png
Binary files differ
diff --git a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.1.png b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.1.png
index b75ba61..b75ba61 100644
--- a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.1.png
+++ b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.1.png
Binary files differ
diff --git a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.2.png b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.2.png
index 4320f6f..4320f6f 100644
--- a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation.2.png
+++ b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.2.png
Binary files differ
diff --git a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.qml b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.qml
index 4d0959a..4ab94f3 100644
--- a/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.qml
+++ b/tests/auto/declarative/qmlvisual/animation/colorAnimation/data/colorAnimation-visual.qml
@@ -258,7 +258,7 @@ VisualTest {
}
Frame {
msec: 960
- image: "colorAnimation.0.png"
+ image: "colorAnimation-visual.0.png"
}
Frame {
msec: 976
@@ -270,7 +270,7 @@ VisualTest {
}
Frame {
msec: 1008
- hash: "243dbffcf416926242bbcb7348974c4c"
+ hash: "e0f53c5605116a30d9bf3c031c63d958"
}
Frame {
msec: 1024
@@ -370,7 +370,7 @@ VisualTest {
}
Frame {
msec: 1408
- hash: "7178bfe86fd2fd513218b33760460f8d"
+ hash: "45770fe0d61c485c13992d0f98b2a3ba"
}
Frame {
msec: 1424
@@ -470,7 +470,7 @@ VisualTest {
}
Frame {
msec: 1808
- hash: "8593a81be812edf54ec94da8ae9c1314"
+ hash: "a2fa71b4147372175774250501b6625e"
}
Frame {
msec: 1824
@@ -498,7 +498,7 @@ VisualTest {
}
Frame {
msec: 1920
- image: "colorAnimation.1.png"
+ image: "colorAnimation-visual.1.png"
}
Frame {
msec: 1936
@@ -570,7 +570,7 @@ VisualTest {
}
Frame {
msec: 2208
- hash: "e5dc5450604a491cc24a0dcf5c278b58"
+ hash: "10d46d2862e333e5136b1c046dabb33b"
}
Frame {
msec: 2224
@@ -738,7 +738,7 @@ VisualTest {
}
Frame {
msec: 2880
- image: "colorAnimation.2.png"
+ image: "colorAnimation-visual.2.png"
}
Frame {
msec: 2896
diff --git a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.0.png b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.0.png
index 64d6b06..64d6b06 100644
--- a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.0.png
+++ b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.0.png
Binary files differ
diff --git a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.1.png b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.1.png
index f7fce15..f7fce15 100644
--- a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.1.png
+++ b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.1.png
Binary files differ
diff --git a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.2.png b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.2.png
index 3080df5..3080df5 100644
--- a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction.2.png
+++ b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.2.png
Binary files differ
diff --git a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.qml b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.qml
index 7c8c233..0a9057e 100644
--- a/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.qml
+++ b/tests/auto/declarative/qmlvisual/animation/propertyAction/data/propertyAction-visual.qml
@@ -242,7 +242,7 @@ VisualTest {
}
Frame {
msec: 960
- image: "propertyAction.0.png"
+ image: "propertyAction-visual.0.png"
}
Frame {
msec: 976
@@ -490,7 +490,7 @@ VisualTest {
}
Frame {
msec: 1920
- image: "propertyAction.1.png"
+ image: "propertyAction-visual.1.png"
}
Frame {
msec: 1936
@@ -738,7 +738,7 @@ VisualTest {
}
Frame {
msec: 2880
- image: "propertyAction.2.png"
+ image: "propertyAction-visual.2.png"
}
Frame {
msec: 2896
@@ -810,7 +810,7 @@ VisualTest {
}
Frame {
msec: 3168
- hash: "dcc79277fdb8966e5a3f2ed1b2fc4292"
+ hash: "38b7e5894cf49a19ac055264d6447b9f"
}
Frame {
msec: 3184
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.1.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.1.png
index 1f960e5..4366d53 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.1.png
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.1.png
Binary files differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.qml b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.qml
index 043f5e2..c6df3c4 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/animated-smooth.qml
@@ -130,7 +130,7 @@ VisualTest {
}
Frame {
msec: 512
- hash: "37c3f25e5cfdb48d7e3ab0cf8ffb9154"
+ hash: "0f347763f25350ebb62dda1536372b45"
}
Frame {
msec: 528
@@ -186,7 +186,7 @@ VisualTest {
}
Frame {
msec: 736
- hash: "902683d72f789399e9d99d1cea1bf177"
+ hash: "74af3457583fbaf73f14556aeccc8403"
}
Frame {
msec: 752
@@ -210,7 +210,7 @@ VisualTest {
}
Frame {
msec: 832
- hash: "a15f19f374bbfb6a922b69d080a91eaa"
+ hash: "d2ed2cf3a12e41bac299399cc35abe6a"
}
Frame {
msec: 848
@@ -294,7 +294,7 @@ VisualTest {
}
Frame {
msec: 1168
- hash: "2192094410e2d7c8d9d4aa5f8deacff5"
+ hash: "85ef33fcb3f91e4fc20391bf94455984"
}
Frame {
msec: 1184
@@ -302,7 +302,7 @@ VisualTest {
}
Frame {
msec: 1200
- hash: "92176cce4836dcae4dfca94e49b041a8"
+ hash: "07acba64dc608439a8a54fcb080379e8"
}
Frame {
msec: 1216
@@ -310,7 +310,7 @@ VisualTest {
}
Frame {
msec: 1232
- hash: "42be5d26afb9f066dd27cc9fbaf6ce20"
+ hash: "1f964c6c9bebdc9945dc69a6095400f7"
}
Frame {
msec: 1248
@@ -318,7 +318,7 @@ VisualTest {
}
Frame {
msec: 1264
- hash: "7f9999a9c87af43b9703323efab31770"
+ hash: "2084ccc60ddd493399c128717816d33b"
}
Frame {
msec: 1280
@@ -346,7 +346,7 @@ VisualTest {
}
Frame {
msec: 1376
- hash: "49a1df977b0494c7c72ca0b65c394e13"
+ hash: "45d891d804609ebbe1d5ac3f826d0c17"
}
Frame {
msec: 1392
@@ -406,7 +406,7 @@ VisualTest {
}
Frame {
msec: 1616
- hash: "4520003d4b221a3de6834b2729b3026d"
+ hash: "880640372bf584955627f6835f24be13"
}
Frame {
msec: 1632
@@ -414,7 +414,7 @@ VisualTest {
}
Frame {
msec: 1648
- hash: "83d49474db15d5779923972ff5f55917"
+ hash: "705d9c8de05c859a42769f73761c6a63"
}
Frame {
msec: 1664
@@ -426,7 +426,7 @@ VisualTest {
}
Frame {
msec: 1696
- hash: "d8e398a1ce9ca45c19951e93bd5c932a"
+ hash: "64cd225202ed6c91b02c368a9160a656"
}
Frame {
msec: 1712
@@ -438,7 +438,7 @@ VisualTest {
}
Frame {
msec: 1744
- hash: "fc913807eb1069d611495fbd5d43ee3d"
+ hash: "fe899138116774df4c4441687e3019c5"
}
Frame {
msec: 1760
@@ -450,7 +450,7 @@ VisualTest {
}
Frame {
msec: 1792
- hash: "e3a2b5c7247acfc1b30825233fbfd56b"
+ hash: "c3ea530de646612f9203c5800cad884b"
}
Frame {
msec: 1808
@@ -490,7 +490,7 @@ VisualTest {
}
Frame {
msec: 1952
- hash: "3991bc7760b7981d80665e3a7654c9f4"
+ hash: "b980703c1d0018937e83a8ba8862469e"
}
Frame {
msec: 1968
@@ -502,15 +502,15 @@ VisualTest {
}
Frame {
msec: 2000
- hash: "723f87da7e5b002a2e9b0bcbc81f9458"
+ hash: "ee297a2d68c9e58157d9bf189d353713"
}
Frame {
msec: 2016
- hash: "6b8ded0d9386a3fff0601a100c513080"
+ hash: "00f3c9b8b37cb104cf2a7701639bc61f"
}
Frame {
msec: 2032
- hash: "f976cd5046ef5391536859e63db905bd"
+ hash: "ee297a2d68c9e58157d9bf189d353713"
}
Frame {
msec: 2048
@@ -562,7 +562,7 @@ VisualTest {
}
Frame {
msec: 2240
- hash: "e3a2b5c7247acfc1b30825233fbfd56b"
+ hash: "c3ea530de646612f9203c5800cad884b"
}
Frame {
msec: 2256
@@ -598,7 +598,7 @@ VisualTest {
}
Frame {
msec: 2384
- hash: "83d49474db15d5779923972ff5f55917"
+ hash: "705d9c8de05c859a42769f73761c6a63"
}
Frame {
msec: 2400
@@ -606,7 +606,7 @@ VisualTest {
}
Frame {
msec: 2416
- hash: "4520003d4b221a3de6834b2729b3026d"
+ hash: "880640372bf584955627f6835f24be13"
}
Frame {
msec: 2432
@@ -666,7 +666,7 @@ VisualTest {
}
Frame {
msec: 2656
- hash: "a676f45d946aeb9fa577c0e862735b01"
+ hash: "45d891d804609ebbe1d5ac3f826d0c17"
}
Frame {
msec: 2672
@@ -702,7 +702,7 @@ VisualTest {
}
Frame {
msec: 2800
- hash: "42be5d26afb9f066dd27cc9fbaf6ce20"
+ hash: "1f964c6c9bebdc9945dc69a6095400f7"
}
Frame {
msec: 2816
@@ -710,7 +710,7 @@ VisualTest {
}
Frame {
msec: 2832
- hash: "92176cce4836dcae4dfca94e49b041a8"
+ hash: "07acba64dc608439a8a54fcb080379e8"
}
Frame {
msec: 2848
@@ -802,7 +802,7 @@ VisualTest {
}
Frame {
msec: 3200
- hash: "a15f19f374bbfb6a922b69d080a91eaa"
+ hash: "d2ed2cf3a12e41bac299399cc35abe6a"
}
Frame {
msec: 3216
@@ -826,7 +826,7 @@ VisualTest {
}
Frame {
msec: 3296
- hash: "902683d72f789399e9d99d1cea1bf177"
+ hash: "74af3457583fbaf73f14556aeccc8403"
}
Frame {
msec: 3312
@@ -854,7 +854,7 @@ VisualTest {
}
Frame {
msec: 3408
- hash: "f602e3eda1889d1a7e49560f0dfb5d4c"
+ hash: "89c159ef00d273ecfe61332e1bf7244d"
}
Frame {
msec: 3424
@@ -862,7 +862,7 @@ VisualTest {
}
Frame {
msec: 3440
- hash: "c8312ede0998636a6bd6451d13636577"
+ hash: "61c16009b65a55bffb63e27727e1615e"
}
Frame {
msec: 3456
@@ -950,7 +950,7 @@ VisualTest {
}
Frame {
msec: 3792
- hash: "8419b295f67cae133760da79dfc26505"
+ hash: "f22a47b846cfee96ebdf39bbce2e6d51"
}
Frame {
msec: 3808
@@ -970,7 +970,7 @@ VisualTest {
}
Frame {
msec: 3872
- hash: "d56ba74d38c1889a278929d1c1b7f17a"
+ hash: "ed9f2ca797894612600bc4b7fbaecb84"
}
Frame {
msec: 3888
@@ -1130,7 +1130,7 @@ VisualTest {
}
Frame {
msec: 4512
- hash: "37c3f25e5cfdb48d7e3ab0cf8ffb9154"
+ hash: "0f347763f25350ebb62dda1536372b45"
}
Frame {
msec: 4528
@@ -1186,7 +1186,7 @@ VisualTest {
}
Frame {
msec: 4736
- hash: "902683d72f789399e9d99d1cea1bf177"
+ hash: "74af3457583fbaf73f14556aeccc8403"
}
Frame {
msec: 4752
@@ -1210,7 +1210,7 @@ VisualTest {
}
Frame {
msec: 4832
- hash: "a15f19f374bbfb6a922b69d080a91eaa"
+ hash: "d2ed2cf3a12e41bac299399cc35abe6a"
}
Frame {
msec: 4848
@@ -1294,7 +1294,7 @@ VisualTest {
}
Frame {
msec: 5168
- hash: "2192094410e2d7c8d9d4aa5f8deacff5"
+ hash: "85ef33fcb3f91e4fc20391bf94455984"
}
Frame {
msec: 5184
@@ -1302,7 +1302,7 @@ VisualTest {
}
Frame {
msec: 5200
- hash: "92176cce4836dcae4dfca94e49b041a8"
+ hash: "07acba64dc608439a8a54fcb080379e8"
}
Frame {
msec: 5216
@@ -1310,7 +1310,7 @@ VisualTest {
}
Frame {
msec: 5232
- hash: "42be5d26afb9f066dd27cc9fbaf6ce20"
+ hash: "1f964c6c9bebdc9945dc69a6095400f7"
}
Frame {
msec: 5248
@@ -1318,7 +1318,7 @@ VisualTest {
}
Frame {
msec: 5264
- hash: "7f9999a9c87af43b9703323efab31770"
+ hash: "2084ccc60ddd493399c128717816d33b"
}
Frame {
msec: 5280
@@ -1346,7 +1346,7 @@ VisualTest {
}
Frame {
msec: 5376
- hash: "49a1df977b0494c7c72ca0b65c394e13"
+ hash: "45d891d804609ebbe1d5ac3f826d0c17"
}
Frame {
msec: 5392
@@ -1406,7 +1406,7 @@ VisualTest {
}
Frame {
msec: 5616
- hash: "4520003d4b221a3de6834b2729b3026d"
+ hash: "880640372bf584955627f6835f24be13"
}
Frame {
msec: 5632
@@ -1414,7 +1414,7 @@ VisualTest {
}
Frame {
msec: 5648
- hash: "83d49474db15d5779923972ff5f55917"
+ hash: "705d9c8de05c859a42769f73761c6a63"
}
Frame {
msec: 5664
@@ -1426,7 +1426,7 @@ VisualTest {
}
Frame {
msec: 5696
- hash: "d8e398a1ce9ca45c19951e93bd5c932a"
+ hash: "64cd225202ed6c91b02c368a9160a656"
}
Frame {
msec: 5712
@@ -1438,7 +1438,7 @@ VisualTest {
}
Frame {
msec: 5744
- hash: "fc913807eb1069d611495fbd5d43ee3d"
+ hash: "fe899138116774df4c4441687e3019c5"
}
Frame {
msec: 5760
@@ -1450,7 +1450,7 @@ VisualTest {
}
Frame {
msec: 5792
- hash: "e3a2b5c7247acfc1b30825233fbfd56b"
+ hash: "c3ea530de646612f9203c5800cad884b"
}
Frame {
msec: 5808
@@ -1482,7 +1482,7 @@ VisualTest {
}
Frame {
msec: 5920
- hash: "ec7e1190dd4fe122545e6ce6c8740500"
+ hash: "3b7b83e97d17440b42e6ef4b962076d8"
}
Frame {
msec: 5936
@@ -1490,7 +1490,7 @@ VisualTest {
}
Frame {
msec: 5952
- hash: "3991bc7760b7981d80665e3a7654c9f4"
+ hash: "b980703c1d0018937e83a8ba8862469e"
}
Frame {
msec: 5968
@@ -1502,15 +1502,15 @@ VisualTest {
}
Frame {
msec: 6000
- hash: "723f87da7e5b002a2e9b0bcbc81f9458"
+ hash: "ee297a2d68c9e58157d9bf189d353713"
}
Frame {
msec: 6016
- hash: "6b8ded0d9386a3fff0601a100c513080"
+ hash: "00f3c9b8b37cb104cf2a7701639bc61f"
}
Frame {
msec: 6032
- hash: "f976cd5046ef5391536859e63db905bd"
+ hash: "ee297a2d68c9e58157d9bf189d353713"
}
Frame {
msec: 6048
@@ -1562,7 +1562,7 @@ VisualTest {
}
Frame {
msec: 6240
- hash: "e3a2b5c7247acfc1b30825233fbfd56b"
+ hash: "c3ea530de646612f9203c5800cad884b"
}
Frame {
msec: 6256
@@ -1598,7 +1598,7 @@ VisualTest {
}
Frame {
msec: 6384
- hash: "83d49474db15d5779923972ff5f55917"
+ hash: "705d9c8de05c859a42769f73761c6a63"
}
Frame {
msec: 6400
@@ -1606,7 +1606,7 @@ VisualTest {
}
Frame {
msec: 6416
- hash: "4520003d4b221a3de6834b2729b3026d"
+ hash: "880640372bf584955627f6835f24be13"
}
Frame {
msec: 6432
@@ -1666,7 +1666,7 @@ VisualTest {
}
Frame {
msec: 6656
- hash: "a676f45d946aeb9fa577c0e862735b01"
+ hash: "45d891d804609ebbe1d5ac3f826d0c17"
}
Frame {
msec: 6672
@@ -1702,7 +1702,7 @@ VisualTest {
}
Frame {
msec: 6800
- hash: "42be5d26afb9f066dd27cc9fbaf6ce20"
+ hash: "1f964c6c9bebdc9945dc69a6095400f7"
}
Frame {
msec: 6816
@@ -1710,7 +1710,7 @@ VisualTest {
}
Frame {
msec: 6832
- hash: "92176cce4836dcae4dfca94e49b041a8"
+ hash: "07acba64dc608439a8a54fcb080379e8"
}
Frame {
msec: 6848
@@ -1779,7 +1779,7 @@ VisualTest {
Key {
type: 6
key: 16777249
- modifiers: 67108864
+ modifiers: 0
text: ""
autorep: false
count: 1
@@ -1810,7 +1810,7 @@ VisualTest {
}
Frame {
msec: 7200
- hash: "a15f19f374bbfb6a922b69d080a91eaa"
+ hash: "d2ed2cf3a12e41bac299399cc35abe6a"
}
Frame {
msec: 7216
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.1.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.1.png
deleted file mode 100644
index 80cbd26..0000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.1.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.2.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.2.png
deleted file mode 100644
index 80cbd26..0000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.2.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.3.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.3.png
deleted file mode 100644
index 80cbd26..0000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.3.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.4.png b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.4.png
deleted file mode 100644
index 80cbd26..0000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.4.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.qml b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.qml
index 16cd5e9..1403d35 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeborderimage/data/borders.qml
@@ -6,1354 +6,6 @@ VisualTest {
}
Frame {
msec: 16
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 32
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 48
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 64
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 80
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 96
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 112
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 128
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 144
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 160
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 176
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 192
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 208
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 224
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 240
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 256
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 272
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 288
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 304
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 320
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 336
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 352
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 368
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 384
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 400
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 416
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 432
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 448
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 464
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 480
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 496
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 512
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 528
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 544
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 560
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 576
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 592
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 608
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 624
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 640
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 656
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 672
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 688
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 704
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 720
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 736
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 752
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 768
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 784
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 800
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 816
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 832
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 848
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 864
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 880
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 896
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 912
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 928
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 944
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 960
- image: "borders.0.png"
- }
- Frame {
- msec: 976
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 992
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1008
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1024
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1040
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1056
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1072
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1088
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1104
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1120
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1136
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1152
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1168
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1184
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1200
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1216
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1232
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1248
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1264
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1280
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1296
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1312
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1328
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1344
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1360
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1376
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1392
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1408
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1424
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1440
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1456
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1472
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1488
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1504
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1520
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1536
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1552
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1568
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1584
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1600
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1616
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1632
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1648
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1664
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1680
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1696
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1712
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1728
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1744
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1760
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1776
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1792
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1808
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1824
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1840
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1856
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1872
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1888
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1904
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1920
- image: "borders.1.png"
- }
- Frame {
- msec: 1936
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1952
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1968
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 1984
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2000
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2016
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2032
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2048
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2064
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2080
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2096
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2112
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2128
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2144
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2160
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2176
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2192
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2208
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2224
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2240
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2256
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2272
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2288
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2304
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2320
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2336
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2352
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2368
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2384
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2400
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2416
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2432
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2448
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2464
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2480
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2496
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2512
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2528
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2544
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2560
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2576
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2592
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2608
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2624
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2640
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2656
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2672
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2688
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2704
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2720
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2736
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2752
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2768
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2784
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2800
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2816
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2832
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2848
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2864
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2880
- image: "borders.2.png"
- }
- Frame {
- msec: 2896
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2912
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2928
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2944
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2960
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2976
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 2992
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3008
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3024
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3040
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3056
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3072
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3088
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3104
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3120
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3136
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3152
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3168
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3184
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3200
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3216
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3232
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3248
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3264
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3280
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3296
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3312
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3328
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3344
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3360
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3376
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3392
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3408
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3424
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3440
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3456
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3472
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3488
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3504
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3520
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3536
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3552
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3568
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3584
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3600
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3616
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3632
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3648
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3664
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3680
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3696
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3712
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3728
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3744
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3760
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3776
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3792
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3808
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3824
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3840
- image: "borders.3.png"
- }
- Frame {
- msec: 3856
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3872
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3888
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3904
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3920
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3936
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3952
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3968
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 3984
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4000
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4016
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4032
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4048
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4064
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4080
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4096
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4112
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4128
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4144
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4160
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4176
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4192
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4208
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4224
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4240
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4256
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4272
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4288
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4304
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4320
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4336
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4352
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4368
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4384
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4400
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4416
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4432
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4448
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4464
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4480
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4496
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4512
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4528
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4544
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4560
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4576
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4592
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4608
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4624
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4640
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4656
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4672
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4688
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4704
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4720
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4736
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4752
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4768
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4784
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4800
- image: "borders.4.png"
- }
- Frame {
- msec: 4816
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4832
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4848
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4864
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4880
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4896
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4912
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4928
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4944
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4960
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4976
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 4992
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5008
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5024
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5040
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5056
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5072
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5088
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5104
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5120
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5136
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5152
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5168
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5184
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5200
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5216
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5232
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5248
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5264
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5280
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5296
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5312
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5328
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5344
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5360
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5376
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5392
- hash: "ab9753116e289c932064144bb0845857"
- }
- Frame {
- msec: 5408
- hash: "ab9753116e289c932064144bb0845857"
+ hash: "258a7e75b491e4f51a91739c776803b3"
}
}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml
index 2d481c9..fc8261f 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeparticles/particles.qml
@@ -1,4 +1,5 @@
import Qt 4.6
+import Qt.labs.particles 1.0
Rectangle {
width: 640; height: 480; color: "black"
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/repeater.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.qml
index 1eb115d..1eb115d 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/repeater.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.qml
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/repeater.qml b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/usingRepeater.qml
index ff60365..ff60365 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/repeater.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/usingRepeater.qml
diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
index 718e3a6..681b530 100644
--- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
+++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
@@ -100,20 +100,35 @@ void tst_qmlvisual::visual_data()
if (qgetenv("QMLVISUAL_ALL") != "")
files << findQmlFiles(QDir(QT_TEST_SOURCE_DIR));
else {
+ //these are newly added tests we want to try out in CI (then move to the stable list)
+ files << QT_TEST_SOURCE_DIR "/qdeclarativeborderimage/borders.qml";
+ files << QT_TEST_SOURCE_DIR "/qdeclarativeborderimage/animated.qml";
+ files << QT_TEST_SOURCE_DIR "/qdeclarativeborderimage/animated-smooth.qml";
+ files << QT_TEST_SOURCE_DIR "/qdeclarativeflipable/test-flipable.qml";
+ files << QT_TEST_SOURCE_DIR "/qdeclarativepositioners/usingRepeater.qml";
+
//these are tests we think are stable and useful enough to be run by the CI system
files << QT_TEST_SOURCE_DIR "/animation/bindinganimation/bindinganimation.qml";
- files << QT_TEST_SOURCE_DIR "/animation/colorAnimation/colorAnimation-visual.qml";
- files << QT_TEST_SOURCE_DIR "/animation/easing/easing.qml";
files << QT_TEST_SOURCE_DIR "/animation/loop/loop.qml";
files << QT_TEST_SOURCE_DIR "/animation/parallelAnimation/parallelAnimation-visual.qml";
files << QT_TEST_SOURCE_DIR "/animation/parentAnimation/parentAnimation-visual.qml";
- files << QT_TEST_SOURCE_DIR "/animation/pauseAnimation/pauseAnimation-visual.qml";
- files << QT_TEST_SOURCE_DIR "/animation/propertyAction/propertyAction-visual.qml";
files << QT_TEST_SOURCE_DIR "/animation/reanchor/reanchor.qml";
files << QT_TEST_SOURCE_DIR "/animation/scriptAction/scriptAction-visual.qml";
- files << QT_TEST_SOURCE_DIR "/qdeclarativemousearea/mousearea-visual.qml";
files << QT_TEST_SOURCE_DIR "/qdeclarativemousearea/drag.qml";
files << QT_TEST_SOURCE_DIR "/fillmode/fillmode.qml";
+
+ //these reliably fail in CI, for unknown reasons
+ //files << QT_TEST_SOURCE_DIR "/animation/easing/easing.qml";
+ //files << QT_TEST_SOURCE_DIR "/animation/pauseAnimation/pauseAnimation-visual.qml";
+
+ //these reliably fail on Linux because of color interpolation (different float rounding)
+#if !defined(Q_WS_X11) && !defined(Q_WS_QWS)
+ files << QT_TEST_SOURCE_DIR "/animation/colorAnimation/colorAnimation-visual.qml";
+ files << QT_TEST_SOURCE_DIR "/animation/propertyAction/propertyAction-visual.qml";
+#endif
+
+ //this is unstable because the MouseArea press-and-hold timer is not synchronized to the animation framework.
+ //files << QT_TEST_SOURCE_DIR "/qdeclarativemousearea/mousearea-visual.qml";
}
foreach (const QString &file, files) {