diff options
| author | Tor Arne Vestbø <[email protected]> | 2018-07-18 13:56:47 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <[email protected]> | 2018-07-20 06:40:11 +0000 |
| commit | 65463857a9f489f45b68287bdcc4fe540eeb2463 (patch) | |
| tree | b81db692a3ce41938109274c0844a645123ebc4e | |
| parent | 8aa14a84a91d3f8116e04cbe68bfcdb0207c2a3b (diff) | |
Inline deprecated QTest::qWaitForWindowShown
Change-Id: Ie8c3975643b9d7e60caf9de4dd3eaa13066a1028
Reviewed-by: Simon Hausmann <[email protected]>
Reviewed-by: Tor Arne Vestbø <[email protected]>
| -rw-r--r-- | src/widgets/kernel/qtestsupport_widgets.cpp | 6 | ||||
| -rw-r--r-- | src/widgets/kernel/qtestsupport_widgets.h | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/widgets/kernel/qtestsupport_widgets.cpp b/src/widgets/kernel/qtestsupport_widgets.cpp index a1b35cc45b3..b227e6ff5dc 100644 --- a/src/widgets/kernel/qtestsupport_widgets.cpp +++ b/src/widgets/kernel/qtestsupport_widgets.cpp @@ -89,7 +89,6 @@ Q_WIDGETS_EXPORT Q_REQUIRED_RESULT bool QTest::qWaitForWindowExposed(QWidget *wi return false; } -#if QT_DEPRECATED_SINCE(5, 0) /*! \fn bool qWaitForWindowShown(QWidget *widget, int timeout) \relates QTest \since 5.0 @@ -110,10 +109,5 @@ Q_WIDGETS_EXPORT Q_REQUIRED_RESULT bool QTest::qWaitForWindowExposed(QWidget *wi \sa QTest::qWaitForWindowActive(), QTest::qWaitForWindowExposed() */ -Q_WIDGETS_EXPORT QT_DEPRECATED Q_REQUIRED_RESULT bool QTest::qWaitForWindowShown(QWidget *widget, int timeout) -{ - return QTest::qWaitForWindowExposed(widget, timeout); -} -#endif QT_END_NAMESPACE diff --git a/src/widgets/kernel/qtestsupport_widgets.h b/src/widgets/kernel/qtestsupport_widgets.h index b96365899a0..ca1406b0b20 100644 --- a/src/widgets/kernel/qtestsupport_widgets.h +++ b/src/widgets/kernel/qtestsupport_widgets.h @@ -51,7 +51,8 @@ Q_WIDGETS_EXPORT Q_REQUIRED_RESULT bool qWaitForWindowActive(QWidget *widget, in Q_WIDGETS_EXPORT Q_REQUIRED_RESULT bool qWaitForWindowExposed(QWidget *widget, int timeout = 5000); #if QT_DEPRECATED_SINCE(5, 0) -Q_WIDGETS_EXPORT QT_DEPRECATED Q_REQUIRED_RESULT bool qWaitForWindowShown(QWidget *widget, int timeout = 5000); +QT_DEPRECATED Q_REQUIRED_RESULT inline static bool qWaitForWindowShown(QWidget *widget, int timeout = 5000) +{ return QTest::qWaitForWindowExposed(widget, timeout); } #endif } |