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/qquickitem2 | |
| 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/qquickitem2')
| -rw-r--r-- | tests/auto/quick/qquickitem2/tst_qquickitem.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp index 8b445e38b9..e605bb4cbc 100644 --- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp +++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp @@ -286,7 +286,7 @@ void tst_QQuickItem::keys() window->setSource(testFileUrl("keystest.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QVERIFY(QGuiApplication::focusWindow() == window); @@ -414,7 +414,7 @@ void tst_QQuickItem::keysProcessingOrder() window->setSource(testFileUrl("keyspriority.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QVERIFY(QGuiApplication::focusWindow() == window); @@ -472,7 +472,7 @@ void tst_QQuickItem::keysim() window->setSource(testFileUrl("keysim.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QVERIFY(QGuiApplication::focusWindow() == window); @@ -657,7 +657,7 @@ void tst_QQuickItem::keyNavigation() window->setSource(testFileUrl("keynavigationtest.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QVERIFY(QGuiApplication::focusWindow() == window); @@ -734,7 +734,7 @@ void tst_QQuickItem::keyNavigation_RightToLeft() window->setSource(testFileUrl("keynavigationtest.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QVERIFY(QGuiApplication::focusWindow() == window); @@ -789,7 +789,7 @@ void tst_QQuickItem::keyNavigation_skipNotVisible() window->setSource(testFileUrl("keynavigationtest.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QVERIFY(QGuiApplication::focusWindow() == window); @@ -864,7 +864,7 @@ void tst_QQuickItem::keyNavigation_implicitSetting() window->setSource(testFileUrl("keynavigationtest_implicit.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QVERIFY(QGuiApplication::focusWindow() == window); @@ -1259,7 +1259,7 @@ void tst_QQuickItem::propertyChanges() window->setBaseSize(QSize(300, 300)); window->setSource(testFileUrl("propertychanges.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QVERIFY(QGuiApplication::focusWindow() == window); @@ -1671,7 +1671,7 @@ void tst_QQuickItem::contains() window->setBaseSize(QSize(400, 400)); window->setSource(testFileUrl("hollowTestItem.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QVERIFY(QGuiApplication::focusWindow() == window); |