AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Inline deprecated QTest::qWaitForWindowShown

Browse Source 
Change-Id: Ie8c3975643b9d7e60caf9de4dd3eaa13066a1028
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Tor Arne Vestbø 2018-07-18 13:56:47 +02:00
parent 8aa14a84a9
commit 65463857a9
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/kernel/qtestsupport_widgets.cpp
View File

@ -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

3
src/widgets/kernel/qtestsupport_widgets.h
View File

@ -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
}