summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2010-09-16 07:54:19 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2010-09-16 07:54:58 (GMT)
commitb1cea5eb85645450b29fd673795325ed0d4d7009 (patch)
tree303c5695fd2f99012c0089a052955da513116398
parent43f13b2deed1dc3797dec58b46957714ff635f66 (diff)
downloadQt-b1cea5eb85645450b29fd673795325ed0d4d7009.zip
Qt-b1cea5eb85645450b29fd673795325ed0d4d7009.tar.gz
Qt-b1cea5eb85645450b29fd673795325ed0d4d7009.tar.bz2
Make test less sensitive to platform specifics
Zero timers on Windows are implemented using posted events, as are QueuedConnections, making the QTBUG13633_dontBlockEvents test sensitive to the order between invokeMethod() and starting a zero timer. Reviewed-by: Olivier
-rw-r--r--tests/auto/qtimer/tst_qtimer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qtimer/tst_qtimer.cpp b/tests/auto/qtimer/tst_qtimer.cpp
index 73b3452..f23d065 100644
--- a/tests/auto/qtimer/tst_qtimer.cpp
+++ b/tests/auto/qtimer/tst_qtimer.cpp
@@ -701,8 +701,8 @@ DontBlockEvents::DontBlockEvents()
void DontBlockEvents::timerEvent(QTimerEvent* event)
{
if (event->timerId() == m_timer.timerId()) {
- m_timer.start(0, this);
QMetaObject::invokeMethod(this, "paintEvent", Qt::QueuedConnection);
+ m_timer.start(0, this);
count++;
QCOMPARE(count, 1);
total++;