diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-08-22 11:24:15 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-23 08:32:17 +0200 |
| commit | e9bc07c4f24e8580a688c41b91a63e12851bb5ce (patch) | |
| tree | 6379008686a070c4d970f1d434216bc251607c82 /src | |
| parent | 41ca2b445365ac05877e962f5c3d477bca64e633 (diff) | |
Remove qWaitForWindowShown(QWindow*) overload.
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/testlib/qtestcase.cpp | 12 | ||||
| -rw-r--r-- | src/testlib/qtestsystem.h | 6 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 128ee7327b..3bd6848e13 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 634452d4af..9946c4ae5c 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) |