summaryrefslogtreecommitdiffstats
path: root/tests/auto/qwidget
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-10-02 17:17:41 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-10-02 17:19:21 (GMT)
commite3fa7e2f0fd8f69d3de96af9ba0b868bd3ccc07c (patch)
tree2b29d9836d9114bdb363c1f693411c0cc1c1a539 /tests/auto/qwidget
parent0981f27d76436f8058d8534b7454777910922ee0 (diff)
downloadQt-e3fa7e2f0fd8f69d3de96af9ba0b868bd3ccc07c.zip
Qt-e3fa7e2f0fd8f69d3de96af9ba0b868bd3ccc07c.tar.gz
Qt-e3fa7e2f0fd8f69d3de96af9ba0b868bd3ccc07c.tar.bz2
Stablilize autotests on X11
Diffstat (limited to 'tests/auto/qwidget')
-rw-r--r--tests/auto/qwidget/tst_qwidget.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index e31d621..b0a26c2 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -5498,10 +5498,11 @@ void tst_QWidget::multipleToplevelFocusCheck()
QTest::qWait(100);
- w1.activateWindow();
QApplication::setActiveWindow(&w1);
+ w1.activateWindow();
QApplication::processEvents();
QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&w1));
+ QTest::qWait(50);
QTest::mouseDClick(&w1, Qt::LeftButton);
QTRY_COMPARE(QApplication::focusWidget(), static_cast<QWidget *>(w1.edit));
@@ -7470,10 +7471,11 @@ void tst_QWidget::updateWhileMinimized()
QTest::qWaitForWindowShown(&widget);
QApplication::processEvents();
QTRY_VERIFY(widget.numPaintEvents > 0);
+ QTest::qWait(50);
// Minimize window.
widget.showMinimized();
- QTest::qWait(30);
+ QTest::qWait(70);
widget.reset();
@@ -8174,7 +8176,7 @@ public:
static bool firstTime = true;
if (firstTime)
- QTimer::singleShot(100, this, SLOT(resizeMe()));
+ QTimer::singleShot(70, this, SLOT(resizeMe()));
firstTime = false;
}
@@ -8709,6 +8711,7 @@ void tst_QWidget::setClearAndResizeMask()
// Disable the size grip on the Mac; otherwise it'll be included when grabbing the window.
resizeParent.setFixedSize(resizeParent.size());
resizeChild.show();
+ QTest::qWait(30);
resizeChild.paintedRegion = QRegion();
QTimer::singleShot(100, &resizeChild, SLOT(shrinkMask()));
@@ -9198,6 +9201,7 @@ void tst_QWidget::focusWidget_task254563()
void tst_QWidget::destroyBackingStore()
{
+#ifdef QT_BUILD_INTERNAL
UpdateWidget w;
w.reset();
w.show();
@@ -9222,6 +9226,7 @@ void tst_QWidget::destroyBackingStore()
w.update();
QApplication::processEvents();
QCOMPARE(w.numPaintEvents, 2);
+#endif
}
void tst_QWidget::rectOutsideCoordinatesLimit_task144779()