diff options
author | Shawn Rutledge <shawn.rutledge@digia.com> | 2012-10-19 18:05:01 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-08 19:04:56 +0100 |
commit | eba5128f66718d33d48a98ae385b5c44569bc70e (patch) | |
tree | 633b2ea25561ce3e493542cb0da77571ce745878 /tests/auto/quick/qquickflickable/tst_qquickflickable.cpp | |
parent | b3b1c3a573979cac69a3932d1edf3a046c1d8b8a (diff) |
All QWindow properties that have "window" in them have been renamed.
Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase.
Change-Id: I9614cc2c7ed119c663b3f6f99267483e291e529c
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'tests/auto/quick/qquickflickable/tst_qquickflickable.cpp')
-rw-r--r-- | tests/auto/quick/qquickflickable/tst_qquickflickable.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp index 7f5802a94d..703e2918e6 100644 --- a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp +++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp @@ -207,7 +207,7 @@ void tst_qquickflickable::rebound() QQuickView *window = new QQuickView; window->setSource(testFileUrl("rebound.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(window->rootObject() != 0); QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(window->rootObject()); @@ -369,7 +369,7 @@ void tst_qquickflickable::nestedPressDelay() QQuickView *window = new QQuickView; window->setSource(testFileUrl("nestedPressDelay.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(window->rootObject() != 0); QQuickFlickable *outer = qobject_cast<QQuickFlickable*>(window->rootObject()); @@ -497,7 +497,7 @@ void tst_qquickflickable::wheel() QQuickView *window = new QQuickView; window->setSource(testFileUrl("wheel.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(window->rootObject() != 0); QQuickFlickable *flick = window->rootObject()->findChild<QQuickFlickable*>("flick"); @@ -565,7 +565,7 @@ void tst_qquickflickable::movingAndFlicking() QQuickView *window = new QQuickView; window->setSource(testFileUrl("flickable03.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QTest::qWaitForWindowActive(window); QVERIFY(window->rootObject() != 0); @@ -725,7 +725,7 @@ void tst_qquickflickable::movingAndDragging() QQuickView *window = new QQuickView; window->setSource(testFileUrl("flickable03.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowExposed(window)); QVERIFY(window->rootObject() != 0); @@ -892,7 +892,7 @@ void tst_qquickflickable::flickOnRelease() QQuickView *window = new QQuickView; window->setSource(testFileUrl("flickable03.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowExposed(window)); QVERIFY(window->rootObject() != 0); @@ -929,7 +929,7 @@ void tst_qquickflickable::pressWhileFlicking() QQuickView *window = new QQuickView; window->setSource(testFileUrl("flickable03.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowExposed(window)); QVERIFY(window->rootObject() != 0); @@ -982,7 +982,7 @@ void tst_qquickflickable::disabled() QQuickView *window = new QQuickView; window->setSource(testFileUrl("disabled.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(window->rootObject() != 0); QQuickFlickable *flick = window->rootObject()->findChild<QQuickFlickable*>("flickable"); @@ -1012,7 +1012,7 @@ void tst_qquickflickable::flickVelocity() QQuickView *window = new QQuickView; window->setSource(testFileUrl("flickable03.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(window->rootObject() != 0); QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(window->rootObject()); @@ -1115,7 +1115,7 @@ void tst_qquickflickable::cancelOnMouseGrab() QQuickView *window = new QQuickView; window->setSource(testFileUrl("cancel.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(window->rootObject() != 0); QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(window->rootObject()); @@ -1151,7 +1151,7 @@ void tst_qquickflickable::clickAndDragWhenTransformed() QQuickView *view = new QQuickView; view->setSource(testFileUrl("transformedFlickable.qml")); view->show(); - view->requestActivateWindow(); + view->requestActivate(); QVERIFY(QTest::qWaitForWindowExposed(view)); QVERIFY(view->rootObject() != 0); |