From e9bc07c4f24e8580a688c41b91a63e12851bb5ce Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 22 Aug 2012 11:24:15 +0200 Subject: [PATCH] Remove qWaitForWindowShown(QWindow*) overload. The QWindow* overload was introduced for Qt 5.0, but is unused already. Change-Id: Ic07f19eac87bc93a589017407668760fceb2f632 Reviewed-by: Friedemann Kleint Reviewed-by: Jason McDonald --- src/testlib/qtestcase.cpp | 12 ------------ src/testlib/qtestsystem.h | 6 ------ 2 files changed, 18 deletions(-) diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 128ee7327bc..3bd6848e134 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -881,18 +881,6 @@ QT_BEGIN_NAMESPACE \sa QTest::qWaitForWindowExposed(), QWindow::isActive() */ -/*! \fn bool QTest::qWaitForWindowShown(QWindow *window, int timeout) - \since 5.0 - \deprecated - - Waits for \a timeout milliseconds or until the \a window is exposed. - Returns true if \c window is exposed within \a timeout milliseconds, otherwise returns false. - - This function does the same as qWaitForWindowExposed(). - - \sa QTest::qWaitForWindowActive(), QTest::qWaitForWindowExposed() -*/ - /*! \fn bool QTest::qWaitForWindowExposed(QWidget *widget, int timeout) \since 5.0 diff --git a/src/testlib/qtestsystem.h b/src/testlib/qtestsystem.h index 634452d4af1..9946c4ae5c7 100644 --- a/src/testlib/qtestsystem.h +++ b/src/testlib/qtestsystem.h @@ -129,12 +129,6 @@ namespace QTest } #endif -#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)