diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-05 12:08:31 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-12 14:22:48 +0200 |
| commit | 46c62433e8bd56e8284a086c2803f547b59e570e (patch) | |
| tree | bd2bd36d5ed6dae7e07ec2324795f6ccf20b9835 | |
| parent | 328e7d96845e1dc55c95245aca98c805bed27016 (diff) | |
Implement qWaitForWindowShown using qWaitForWindowExposed.
Deprecate qWaitForWindowShown for Qt 6 as it is just a wrapper.
Change-Id: I0f8195679679120bd402e273fed4d331dc926708
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| -rw-r--r-- | src/testlib/qtestsystem.h | 6 | ||||
| -rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/testlib/qtestsystem.h b/src/testlib/qtestsystem.h index 31c9f481c5..eb0fcb8178 100644 --- a/src/testlib/qtestsystem.h +++ b/src/testlib/qtestsystem.h @@ -120,10 +120,12 @@ namespace QTest return window->isExposed(); } - inline static bool qWaitForWindowShown(QWindow *window, int timeout = 1000) +#if QT_DEPRECATED_SINCE(6, 0) + QT_DEPRECATED inline static bool qWaitForWindowShown(QWindow *window, int timeout = 1000) { - return qWaitForWindowActive(window, timeout); + return qWaitForWindowExposed(window, timeout); } +#endif // QT_DEPRECATED_SINCE(6, 0) } QT_END_NAMESPACE diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp index a6f846045f..6c52dcbc38 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp @@ -11116,7 +11116,7 @@ void tst_QGraphicsItem::doNotMarkFullUpdateIfNotInScene() view.showFullScreen(); else view.show(); - QTest::qWaitForWindowShown(view.windowHandle()); + QTest::qWaitForWindowActive(view.windowHandle()); view.activateWindow(); QTRY_VERIFY(view.isActiveWindow()); QTRY_VERIFY(view.repaints >= 1); |