From 4677cf3d014d9b25c3516dd0e07a1a3fcd8af8e9 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 20 Jul 2012 12:49:12 +0200 Subject: 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 Reviewed-by: Stephen Kelly Reviewed-by: Jason McDonald --- src/testlib/qtestsystem.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/testlib/qtestsystem.h') 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) { -- cgit v1.2.3