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/qquickpathview | |
| 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/qquickpathview')
| -rw-r--r-- | tests/auto/quick/qquickpathview/tst_qquickpathview.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp index 9695af6f77..f36849abd9 100644 --- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp +++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp @@ -1335,7 +1335,7 @@ void tst_QQuickPathView::package() QVERIFY(window); window->setSource(testFileUrl("pathview_package.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QQuickPathView *pathView = window->rootObject()->findChild<QQuickPathView*>("photoPathView"); @@ -1452,7 +1452,7 @@ void tst_QQuickPathView::mouseDrag() QQuickView *window = createView(); window->setSource(testFileUrl("dragpath.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QCOMPARE(window, qGuiApp->focusWindow()); @@ -1547,7 +1547,7 @@ void tst_QQuickPathView::changePreferredHighlight() window->setGeometry(0,0,400,200); window->setSource(testFileUrl("dragpath.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QCOMPARE(window, qGuiApp->focusWindow()); @@ -1741,7 +1741,7 @@ void tst_QQuickPathView::cancelDrag() QQuickView *window = createView(); window->setSource(testFileUrl("dragpath.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QCOMPARE(window, qGuiApp->focusWindow()); @@ -1787,7 +1787,7 @@ void tst_QQuickPathView::maximumFlickVelocity() QQuickView *window = createView(); window->setSource(testFileUrl("dragpath.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QCOMPARE(window, qGuiApp->focusWindow()); @@ -1873,7 +1873,7 @@ void tst_QQuickPathView::snapOneItem() QQuickView *window = createView(); window->setSource(testFileUrl("panels.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QCOMPARE(window, qGuiApp->focusWindow()); @@ -1927,7 +1927,7 @@ void tst_QQuickPathView::positionViewAtIndex() QQuickView *window = createView(); window->setSource(testFileUrl("pathview3.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QCOMPARE(window, qGuiApp->focusWindow()); @@ -1991,7 +1991,7 @@ void tst_QQuickPathView::indexAt_itemAt() QQuickView *window = createView(); window->setSource(testFileUrl("pathview3.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QCOMPARE(window, qGuiApp->focusWindow()); |