diff options
| author | Peter Yard <peter.yard@nokia.com> | 2010-04-27 00:39:42 (GMT) |
|---|---|---|
| committer | Peter Yard <peter.yard@nokia.com> | 2010-04-27 00:39:42 (GMT) |
| commit | 88b2bf18c558d0e2f8a9268802f277212f17e61e (patch) | |
| tree | d41ca52003037fba9b45605aa6d2ed86f73b940a /tests/auto/declarative/qdeclarativeanimatedimage | |
| parent | 4f3a7b5992b5aed67cced46d5d8c8c2f052dfb66 (diff) | |
| parent | 09293f1d07b019dc7bfe95afb93364cc87774e82 (diff) | |
| download | Qt-88b2bf18c558d0e2f8a9268802f277212f17e61e.zip Qt-88b2bf18c558d0e2f8a9268802f277212f17e61e.tar.gz Qt-88b2bf18c558d0e2f8a9268802f277212f17e61e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativeanimatedimage')
7 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/data/colors.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/colors.qml index 5bada34..62e5b14 100644 --- a/tests/auto/declarative/qdeclarativeanimatedimage/data/colors.qml +++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/colors.qml @@ -1,4 +1,4 @@ -import Qt 4.6 +import Qt 4.7 AnimatedImage { source: "colors.gif" diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.qml index a70db5d..3400789 100644 --- a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.qml +++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.qml @@ -1,4 +1,4 @@ -import Qt 4.6 +import Qt 4.7 AnimatedImage { source: "stickman.gif" diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanerror1.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanerror1.qml index 5b0bdcb..566f9ea 100644 --- a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanerror1.qml +++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanerror1.qml @@ -1,4 +1,4 @@ -import Qt 4.6 +import Qt 4.7 AnimatedImage { sourceSize: "240x180" diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanpause.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanpause.qml index 7ab17d4..92c57b6 100644 --- a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanpause.qml +++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanpause.qml @@ -1,4 +1,4 @@ -import Qt 4.6 +import Qt 4.7 AnimatedImage { source: "stickman.gif" diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanscaled.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanscaled.qml index f4d277a..b8a254f 100644 --- a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanscaled.qml +++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanscaled.qml @@ -1,4 +1,4 @@ -import Qt 4.6 +import Qt 4.7 AnimatedImage { width: 240 diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanstopped.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanstopped.qml index 53b0c3a..2b6074c 100644 --- a/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanstopped.qml +++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanstopped.qml @@ -1,4 +1,4 @@ -import Qt 4.6 +import Qt 4.7 AnimatedImage { source: "stickman.gif" diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp b/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp index 0fb080c..237a436 100644 --- a/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp +++ b/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp @@ -199,7 +199,7 @@ void tst_qdeclarativeanimatedimage::invalidSource() component.setData("import Qt 4.7\n AnimatedImage { source: \"no-such-file.gif\" }", QUrl::fromLocalFile("")); QVERIFY(component.isReady()); - QTest::ignoreMessage(QtWarningMsg, "Error Reading Animated Image File QUrl( \"file:no-such-file.gif\" ) "); + QTest::ignoreMessage(QtWarningMsg, "file::2:2: QML AnimatedImage: Error Reading Animated Image File file:no-such-file.gif"); QDeclarativeAnimatedImage *anim = qobject_cast<QDeclarativeAnimatedImage *>(component.create()); QVERIFY(anim); |