diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2012-07-11 17:32:16 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-17 07:26:15 +0200 |
commit | feb996e3ab44e68082c97102556ea396f5df3f44 (patch) | |
tree | 7613a8a4eaf5a8e0fb2801e9d0d9d1869524c348 /tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp | |
parent | 68bbdacd2d5a6fa02f085a996411fb2b71875174 (diff) |
QQuickCanvas renames
QQuickCanvas is now called QQuickWindow
QQuickCanvas::rootItem is now QQuickWindow::contentItem
QQuickItem::canvas is now QQuickItem::window
QQuickItem::ItemChangeData::canvas is also renamed window
QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow
The functions related to the color property have dropped the clear from
their names.
The first three changes have interim compatibility measures in place to
ease the transition.
Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp')
-rw-r--r-- | tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp b/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp index b45b5d53be..2ed837fe31 100644 --- a/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp +++ b/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp @@ -64,14 +64,14 @@ void tst_qquickanimatedsprite::initTestCase() void tst_qquickanimatedsprite::test_properties() { - QQuickView *canvas = new QQuickView(0); + QQuickView *window = new QQuickView(0); - canvas->setSource(testFileUrl("basic.qml")); - canvas->show(); - QTest::qWaitForWindowShown(canvas); + window->setSource(testFileUrl("basic.qml")); + window->show(); + QTest::qWaitForWindowShown(window); - QVERIFY(canvas->rootObject()); - QQuickAnimatedSprite* sprite = canvas->rootObject()->findChild<QQuickAnimatedSprite*>("sprite"); + QVERIFY(window->rootObject()); + QQuickAnimatedSprite* sprite = window->rootObject()->findChild<QQuickAnimatedSprite*>("sprite"); QVERIFY(sprite); QVERIFY(sprite->running()); @@ -84,19 +84,19 @@ void tst_qquickanimatedsprite::test_properties() sprite->setInterpolate(false); QVERIFY(!sprite->interpolate()); - delete canvas; + delete window; } void tst_qquickanimatedsprite::test_frameChangedSignal() { - QQuickView *canvas = new QQuickView(0); + QQuickView *window = new QQuickView(0); - canvas->setSource(testFileUrl("frameChange.qml")); - canvas->show(); - QTest::qWaitForWindowShown(canvas); + window->setSource(testFileUrl("frameChange.qml")); + window->show(); + QTest::qWaitForWindowShown(window); - QVERIFY(canvas->rootObject()); - QQuickAnimatedSprite* sprite = canvas->rootObject()->findChild<QQuickAnimatedSprite*>("sprite"); + QVERIFY(window->rootObject()); + QQuickAnimatedSprite* sprite = window->rootObject()->findChild<QQuickAnimatedSprite*>("sprite"); QVERIFY(sprite); QVERIFY(!sprite->running()); @@ -109,7 +109,7 @@ void tst_qquickanimatedsprite::test_frameChangedSignal() QTRY_COMPARE(frameChangedSpy.count(), 3*6); QTRY_VERIFY(!sprite->running()); - delete canvas; + delete window; } QTEST_MAIN(tst_qquickanimatedsprite) |