diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-24 07:37:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-24 07:38:02 +0100 |
| commit | 135ebe4f3d268121047fdbfee49f2dd52006165e (patch) | |
| tree | 6b303103f36e69e29cfa860b8b7afc584c55d6f3 /tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | |
| parent | e7feb956280105113b3e58f12e5f32f54199a95a (diff) | |
| parent | 1e8f50a8d069c97ea6a4f00d664c12e594884f54 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: If5d2e621c2fa5476c3ab687a3f4620c54fc3b32e
Diffstat (limited to 'tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp')
| -rw-r--r-- | tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index e5e96d5b3d..5e00ca9450 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -5078,9 +5078,6 @@ void tst_QWidget::showAndMoveChild() { if (m_platform == QStringLiteral("wayland")) QSKIP("Wayland: This fails. Figure out why."); -#if defined(UBUNTU_ONEIRIC) - QSKIP("QTBUG-30566 - Unstable auto-test"); -#endif QWidget parent(0, Qt::Window | Qt::WindowStaysOnTopHint); // prevent custom styles parent.setStyle(QStyleFactory::create(QLatin1String("Windows"))); @@ -7872,9 +7869,6 @@ void tst_QWidget::doubleRepaint() if (!macHasAccessToWindowsServer()) QSKIP("Not having window server access causes the wrong number of repaints to be issues"); #endif -#if defined(UBUNTU_ONEIRIC) - QSKIP("QTBUG-30566 - Unstable auto-test"); -#endif UpdateWidget widget; centerOnScreen(&widget); widget.setFocusPolicy(Qt::StrongFocus); |