Remove qWaitForWindowShown(QWindow*) overload.
authorStephen Kelly <stephen.kelly@kdab.com>
Wed, 22 Aug 2012 09:24:15 +0000 (11:24 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 23 Aug 2012 06:32:17 +0000 (08:32 +0200)
The QWindow* overload was introduced for Qt 5.0, but is unused already.

Change-Id: Ic07f19eac87bc93a589017407668760fceb2f632
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
src/testlib/qtestcase.cpp
src/testlib/qtestsystem.h

index 128ee73..3bd6848 100644 (file)
@@ -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
 
index 634452d..9946c4a 100644 (file)
@@ -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)