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/qquicktext | |
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/qquicktext')
-rw-r--r-- | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index 718a581ed5..c5ffe7d7d7 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -856,7 +856,7 @@ void tst_qquicktext::hAlignImplicitWidth() { QQuickView view(testFileUrl("hAlignImplicitWidth.qml")); view.show(); - view.requestActivateWindow(); + view.requestActivate(); QVERIFY(QTest::qWaitForWindowActive(&view)); QQuickText *text = view.rootObject()->findChild<QQuickText*>("textItem"); @@ -1309,7 +1309,7 @@ void tst_qquicktext::underline() { QQuickView view(testFileUrl("underline.qml")); view.show(); - view.requestActivateWindow(); + view.requestActivate(); QVERIFY(QTest::qWaitForWindowActive(&view)); QQuickText *textObject = view.rootObject()->findChild<QQuickText*>("myText"); QVERIFY(textObject != 0); @@ -1322,7 +1322,7 @@ void tst_qquicktext::overline() { QQuickView view(testFileUrl("overline.qml")); view.show(); - view.requestActivateWindow(); + view.requestActivate(); QVERIFY(QTest::qWaitForWindowActive(&view)); QQuickText *textObject = view.rootObject()->findChild<QQuickText*>("myText"); QVERIFY(textObject != 0); @@ -1335,7 +1335,7 @@ void tst_qquicktext::strikeout() { QQuickView view(testFileUrl("strikeout.qml")); view.show(); - view.requestActivateWindow(); + view.requestActivate(); QVERIFY(QTest::qWaitForWindowActive(&view)); QQuickText *textObject = view.rootObject()->findChild<QQuickText*>("myText"); QVERIFY(textObject != 0); @@ -1894,7 +1894,7 @@ void tst_qquicktext::embeddedImages() QQuickView *view = new QQuickView(qmlfile); view->show(); - view->requestActivateWindow(); + view->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(view)); QQuickText *textObject = qobject_cast<QQuickText*>(view->rootObject()); @@ -2506,7 +2506,7 @@ void tst_qquicktext::lineLaidOutRelayout() QQuickView *window = createView(testFile("lineLayoutRelayout.qml")); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QQuickText *myText = window->rootObject()->findChild<QQuickText*>("myText"); @@ -3611,7 +3611,7 @@ void tst_qquicktext::htmlLists() textObject->setText(text); view->show(); - view->requestActivateWindow(); + view->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(view)); QCOMPARE(textPrivate->extra->doc->lineCount(), nbLines); |