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/qquickimage | |
| 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/qquickimage')
| -rw-r--r-- | tests/auto/quick/qquickimage/tst_qquickimage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickimage/tst_qquickimage.cpp b/tests/auto/quick/qquickimage/tst_qquickimage.cpp index 0e1b192802..38c9bb3d8a 100644 --- a/tests/auto/quick/qquickimage/tst_qquickimage.cpp +++ b/tests/auto/quick/qquickimage/tst_qquickimage.cpp @@ -313,7 +313,7 @@ void tst_qquickimage::mirror() obj->setFillMode(fillMode); obj->setProperty("mirror", true); window->show(); - window->requestActivateWindow(); + window->requestActivate(); QVERIFY(QTest::qWaitForWindowActive(window)); QImage screenshot = window->grabWindow(); @@ -498,7 +498,7 @@ void tst_qquickimage::tiling_QTBUG_6716() QQuickView view(testFileUrl(source)); view.show(); - view.requestActivateWindow(); + view.requestActivate(); QVERIFY(QTest::qWaitForWindowActive(&view)); QQuickImage *tiling = findItem<QQuickImage>(view.rootObject(), "tiling"); |