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/touchmouse | |
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/touchmouse')
-rw-r--r-- | tests/auto/quick/touchmouse/tst_touchmouse.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/quick/touchmouse/tst_touchmouse.cpp b/tests/auto/quick/touchmouse/tst_touchmouse.cpp index 3293890557..4a681e270e 100644 --- a/tests/auto/quick/touchmouse/tst_touchmouse.cpp +++ b/tests/auto/quick/touchmouse/tst_touchmouse.cpp @@ -193,7 +193,7 @@ void tst_TouchMouse::simpleTouchEvent() window->setSource(testFileUrl("singleitem.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowExposed(window)); QVERIFY(window->rootObject() != 0); @@ -308,7 +308,7 @@ void tst_TouchMouse::eventFilter() // window->setSource(testFileUrl("singleitem.qml")); // window->show(); -// window->requestActivateWindow(); +// window->requestActivate(); // QVERIFY(window->rootObject() != 0); // EventItem *eventItem1 = window->rootObject()->findChild<EventItem*>("eventItem1"); @@ -342,7 +342,7 @@ void tst_TouchMouse::mouse() window->setSource(testFileUrl("twoitems.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(window->rootObject() != 0); EventItem *eventItem1 = window->rootObject()->findChild<EventItem*>("eventItem1"); @@ -374,7 +374,7 @@ void tst_TouchMouse::touchOverMouse() window->setSource(testFileUrl("twoitems.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(window->rootObject() != 0); EventItem *eventItem1 = window->rootObject()->findChild<EventItem*>("eventItem1"); @@ -415,7 +415,7 @@ void tst_TouchMouse::mouseOverTouch() window->setSource(testFileUrl("twoitems.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(window->rootObject() != 0); EventItem *eventItem1 = window->rootObject()->findChild<EventItem*>("eventItem1"); @@ -459,7 +459,7 @@ void tst_TouchMouse::buttonOnFlickable() window->setSource(testFileUrl("buttononflickable.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(window->rootObject() != 0); QQuickFlickable *flickable = window->rootObject()->findChild<QQuickFlickable*>("flickable"); @@ -567,7 +567,7 @@ void tst_TouchMouse::buttonOnTouch() QQuickView *window = createView(); window->setSource(testFileUrl("buttonontouch.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(window->rootObject() != 0); QQuickPinchArea *pinchArea = window->rootObject()->findChild<QQuickPinchArea*>("pincharea"); @@ -689,7 +689,7 @@ void tst_TouchMouse::pinchOnFlickable() QQuickView *window = createView(); window->setSource(testFileUrl("pinchonflickable.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(window->rootObject() != 0); QQuickPinchArea *pinchArea = window->rootObject()->findChild<QQuickPinchArea*>("pincharea"); @@ -756,7 +756,7 @@ void tst_TouchMouse::flickableOnPinch() QQuickView *window = createView(); window->setSource(testFileUrl("flickableonpinch.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(window->rootObject() != 0); QQuickPinchArea *pinchArea = window->rootObject()->findChild<QQuickPinchArea*>("pincharea"); @@ -822,7 +822,7 @@ void tst_TouchMouse::mouseOnFlickableOnPinch() QQuickView *window = createView(); window->setSource(testFileUrl("mouseonflickableonpinch.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(window->rootObject() != 0); QQuickPinchArea *pinchArea = window->rootObject()->findChild<QQuickPinchArea*>("pincharea"); |