From bd49862e8e80dce6c0dfd45aeb6881f8496bcb14 Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Fri, 17 Apr 2020 09:44:09 +0200
Subject: [PATCH] Remove deprecated QTest::qWaitForWindowShown overload for
 QtWidgets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Not used anywhere in qtbase or other modules, so trivial to remove.

Change-Id: I98575e77f181e617675e536ff0dd67ac93a2f0f5
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/widgets/kernel/qtestsupport_widgets.cpp | 22 ---------------------
 src/widgets/kernel/qtestsupport_widgets.h   |  5 -----
 2 files changed, 27 deletions(-)

diff --git a/src/widgets/kernel/qtestsupport_widgets.cpp b/src/widgets/kernel/qtestsupport_widgets.cpp
index 0056bebdc6..068917101e 100644
--- a/src/widgets/kernel/qtestsupport_widgets.cpp
+++ b/src/widgets/kernel/qtestsupport_widgets.cpp
@@ -87,26 +87,4 @@ Q_WIDGETS_EXPORT Q_REQUIRED_RESULT bool QTest::qWaitForWindowExposed(QWidget *wi
     return false;
 }
 
-/*! \fn bool QTest::qWaitForWindowShown(QWidget *widget, int timeout)
-    \since 5.0
-    \deprecated
-
-    Use qWaitForWindowExposed() instead.
-
-    Waits for \a timeout milliseconds or until the \a widget's window is exposed.
-    Returns \c true if \c widget's window is exposed within \a timeout milliseconds, otherwise returns \c false.
-
-    This function does the same as qWaitForWindowExposed().
-
-    Example:
-
-    \code
-        QWidget widget;
-        widget.show();
-        QTest::qWaitForWindowShown(&widget);
-    \endcode
-
-    \sa qWaitForWindowActive(), qWaitForWindowExposed()
-*/
-
 QT_END_NAMESPACE
diff --git a/src/widgets/kernel/qtestsupport_widgets.h b/src/widgets/kernel/qtestsupport_widgets.h
index 2b37a9e858..98b297b405 100644
--- a/src/widgets/kernel/qtestsupport_widgets.h
+++ b/src/widgets/kernel/qtestsupport_widgets.h
@@ -49,11 +49,6 @@ class QWidget;
 namespace QTest {
 Q_WIDGETS_EXPORT Q_REQUIRED_RESULT bool qWaitForWindowActive(QWidget *widget, int timeout = 5000);
 Q_WIDGETS_EXPORT Q_REQUIRED_RESULT bool qWaitForWindowExposed(QWidget *widget, int timeout = 5000);
-
-#if QT_DEPRECATED_SINCE(5, 0)
-QT_DEPRECATED Q_REQUIRED_RESULT inline static bool qWaitForWindowShown(QWidget *widget, int timeout = 5000)
-{ return QTest::qWaitForWindowExposed(widget, timeout); }
-#endif
 }
 
 QT_END_NAMESPACE