diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-22 13:16:59 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-22 13:16:59 +0100 |
commit | 503eec194ea8bc70bfdbfd06bd0832a77cfcc137 (patch) | |
tree | 6b32fb2c0d59f2efac71432fe3509af0aad2b8b0 /tests/auto/quick/qquickimage | |
parent | 99eac6e3fb53dc1ca6f8136a02f93c33be3ef52f (diff) | |
parent | d815621963cee5571ed93fb89561c4884a685b6b (diff) |
Merge "Merge branch 'dev' into stable" into refs/staging/stable
Diffstat (limited to 'tests/auto/quick/qquickimage')
-rw-r--r-- | tests/auto/quick/qquickimage/tst_qquickimage.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/quick/qquickimage/tst_qquickimage.cpp b/tests/auto/quick/qquickimage/tst_qquickimage.cpp index 531bf1202e..0804c7b900 100644 --- a/tests/auto/quick/qquickimage/tst_qquickimage.cpp +++ b/tests/auto/quick/qquickimage/tst_qquickimage.cpp @@ -315,8 +315,7 @@ void tst_qquickimage::mirror() obj->setFillMode(fillMode); obj->setProperty("mirror", true); window->show(); - window->requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(window)); + QVERIFY(QTest::qWaitForWindowExposed(window)); QImage screenshot = window->grabWindow(); screenshots[fillMode] = screenshot; @@ -500,8 +499,7 @@ void tst_qquickimage::tiling_QTBUG_6716() QQuickView view(testFileUrl(source)); view.show(); - view.requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(&view)); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QQuickImage *tiling = findItem<QQuickImage>(view.rootObject(), "tiling"); |