diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2013-08-22 00:11:16 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-22 02:04:39 +0200 |
commit | c374f4441ab42d1849431bb42fec91a976a8e502 (patch) | |
tree | 0733146c5df48b91a39097730c445dbe9cd2359a /tests/auto/widgets/kernel | |
parent | 85b24bb2dea97c3a9b013bacd5a422b26fe5d14b (diff) | |
parent | c8ca300e491c186304d0864a9e870337e891e6f7 (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/widgets/kernel')
-rw-r--r-- | tests/auto/widgets/kernel/qwidget/qwidget.pro | 1 | ||||
-rw-r--r-- | tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/widgets/kernel/qwidget/qwidget.pro b/tests/auto/widgets/kernel/qwidget/qwidget.pro index 6916ee85e6..a4fcde8a34 100644 --- a/tests/auto/widgets/kernel/qwidget/qwidget.pro +++ b/tests/auto/widgets/kernel/qwidget/qwidget.pro @@ -23,3 +23,4 @@ x11 { !wince*:win32: LIBS += -luser32 -lgdi32 mac:CONFIG+=insignificant_test # QTBUG-25300, QTBUG-23695 +linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC # QTBUG-30566
\ No newline at end of file diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index fefa7333d1..0085b75299 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -4859,6 +4859,9 @@ void tst_QWidget::moveChild_data() void tst_QWidget::moveChild() { +#if defined(UBUNTU_ONEIRIC) + QSKIP("QTBUG-30566 - Unstable auto-test"); +#endif QFETCH(QPoint, offset); ColorWidget parent; @@ -4909,6 +4912,9 @@ void tst_QWidget::moveChild() void tst_QWidget::showAndMoveChild() { +#if defined(UBUNTU_ONEIRIC) + QSKIP("QTBUG-30566 - Unstable auto-test"); +#endif QWidget parent(0, Qt::FramelessWindowHint); // prevent custom styles parent.setStyle(QStyleFactory::create(QLatin1String("Windows"))); @@ -7637,6 +7643,9 @@ 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; widget.setFocusPolicy(Qt::StrongFocus); // Filter out activation change and focus events to avoid update() calls in QWidget. |