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 /src/testlib/qtestsystem.h | |
| 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>
Diffstat (limited to 'src/testlib/qtestsystem.h')
| -rw-r--r-- | src/testlib/qtestsystem.h | 6 |
1 files changed, 4 insertions, 2 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 |