diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-20 12:49:12 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-25 07:24:49 +0200 |
| commit | 4677cf3d014d9b25c3516dd0e07a1a3fcd8af8e9 (patch) | |
| tree | d2e8f109b850c13346c85b6e3dca0077530ac45b /src/testlib | |
| parent | a4cd6ef25df6a2a99626a0e97bfc239f68e7771f (diff) | |
Deprecate the qWaitForWindowShown(QWindow *) method.
While the qWaitForWindowShown(QWidget *) is inherited
from Qt 4.8, the qWaitForWindowShown(QWindow *) was introduced
in Qt 5. As it is identical to qWaitForWindowExposed()
and removed already, it can be deprecated in Qt 5.
Remove its usages in qtbase.
Change-Id: I28788d120ad687a49f02b2b44de6b38a2832fe5c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtestsystem.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/testlib/qtestsystem.h b/src/testlib/qtestsystem.h index 66849f465d..634452d4af 100644 --- a/src/testlib/qtestsystem.h +++ b/src/testlib/qtestsystem.h @@ -129,12 +129,13 @@ namespace QTest } #endif -#if QT_DEPRECATED_SINCE(6, 0) +#if QT_DEPRECATED_SINCE(5, 0) QT_DEPRECATED inline static bool qWaitForWindowShown(QWindow *window, int timeout = 1000) { return qWaitForWindowExposed(window, timeout); } - +#endif // QT_DEPRECATED_SINCE(5, 0) +#if QT_DEPRECATED_SINCE(6, 0) # ifdef QT_WIDGETS_LIB QT_DEPRECATED inline static bool qWaitForWindowShown(QWidget *widget, int timeout = 1000) { |