diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-08 16:11:33 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-08 16:11:33 +0100 |
| commit | 72e5124b8517662ca2cd25deb5806bc04d20c022 (patch) | |
| tree | 5950af37125647a6f14369eab667c7d611d1ac69 /tests/auto/widgets/kernel | |
| parent | a19c22ebf8775f73b840f52b7e03869166ca0dab (diff) | |
| parent | a12f6ba302e54c1570c54aa4c722f2dafbf794af (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Conflicts:
tests/auto/opengl/qgl/tst_qgl.cpp
Change-Id: I3c601351c984c1f4b00478d3c47ac9eeb021e892
Diffstat (limited to 'tests/auto/widgets/kernel')
| -rw-r--r-- | tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp b/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp index f16fe49712..2d3e3c1702 100644 --- a/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp +++ b/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp @@ -103,6 +103,10 @@ void tst_QToolTip::task183679() QFETCH(Qt::Key, key); QFETCH(bool, visible); +#ifdef Q_OS_MAC + QSKIP("This test fails in the CI system, QTBUG-30040"); +#endif + Widget_task183679 widget; widget.show(); QApplication::setActiveWindow(&widget); |