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/qquickpincharea | |
| 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/qquickpincharea')
| -rw-r--r-- | tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp b/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp index 29c65e0acb..b3147067b0 100644 --- a/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp +++ b/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp @@ -87,7 +87,7 @@ void tst_QQuickPinchArea::pinchProperties() QQuickView *window = createView(); window->setSource(testFileUrl("pinchproperties.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(window->rootObject() != 0); QQuickPinchArea *pinchArea = window->rootObject()->findChild<QQuickPinchArea*>("pincharea"); @@ -213,7 +213,7 @@ void tst_QQuickPinchArea::scale() QQuickView *window = createView(); window->setSource(testFileUrl("pinchproperties.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QVERIFY(window->rootObject() != 0); qApp->processEvents(); @@ -276,7 +276,7 @@ void tst_QQuickPinchArea::pan() QQuickView *window = createView(); window->setSource(testFileUrl("pinchproperties.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QVERIFY(window->rootObject() != 0); qApp->processEvents(); @@ -337,7 +337,7 @@ void tst_QQuickPinchArea::retouch() QQuickView *window = createView(); window->setSource(testFileUrl("pinchproperties.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QVERIFY(window->rootObject() != 0); qApp->processEvents(); @@ -451,7 +451,7 @@ void tst_QQuickPinchArea::transformedPinchArea() QQuickView *view = createView(); view->setSource(testFileUrl("transformedPinchArea.qml")); view->show(); - view->requestActivateWindow(); + view->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(view)); QVERIFY(view->rootObject() != 0); qApp->processEvents(); |