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

Improved qWaitForWindowShown().

Browse Source 
Made faster by actually waiting for the window to be exposed, using
similar waiting logic as qWait(). Should speed up autotests that use it
quite a bit.

Change-Id: I628c6110a554fdbbf5bed7e91f57c2fe341113ed
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Samuel Rødal 2012-03-14 12:16:45 +01:00 committed by Qt by Nokia
parent a17907829e
commit 0b70d8c6af
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/testlib/qtestsystem.h
View File

@ -53,9 +53,6 @@ QT_BEGIN_NAMESPACE
class QWidget;
#ifdef Q_WS_X11
extern void qt_x11_wait_for_window_manager(QWidget *w);
#endif
namespace QTest
{
@ -73,23 +70,26 @@ namespace QTest
}
inline static bool qWaitForWindowShown(QWidget *window)
{
#if defined(Q_WS_X11)
qt_x11_wait_for_window_manager(window);
QCoreApplication::processEvents();
#else
Q_UNUSED(window);
qWait(200);
#endif
return true;
}
inline static bool qWaitForWindowShown(QWindow *window)
{
Q_UNUSED(window);
qWait(200);
return true;
}
inline static bool qWaitForWindowShown(QWindow *window)
{
QElapsedTimer timer;
timer.start();
while (!window->isExposed()) {
int remaining = int(timer.elapsed()) - 1000;
if (remaining <= 0)
break;
QCoreApplication::processEvents(QEventLoop::AllEvents, remaining);
QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
QTest::qSleep(10);
}
return true;
}
}
QT_END_NAMESPACE