diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-12-04 09:58:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-12-04 09:58:43 +0100 |
| commit | 5d5c00c67682bce105197b659687fd1fee8f60cf (patch) | |
| tree | 686e41dc3ea121235fb73afb9157ed603f1bfeff /tests/auto/widgets/util/qscroller/tst_qscroller.cpp | |
| parent | f213e818f03d35cb82e3daf187415197fd156f8e (diff) | |
| parent | b82559244e2dc03f1ceff66bb67630df4300dc7c (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/gui/painting/qdrawhelper.cpp
Change-Id: I4916e07b635e1d3830e9b46ef7914f99bec3098e
Diffstat (limited to 'tests/auto/widgets/util/qscroller/tst_qscroller.cpp')
| -rw-r--r-- | tests/auto/widgets/util/qscroller/tst_qscroller.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp index 43063881b2..fac13c7074 100644 --- a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp +++ b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp @@ -347,9 +347,6 @@ void tst_QScroller::scrollerProperties() void tst_QScroller::scrollTo() { -#ifdef Q_OS_MAC - QSKIP("Flakey test - QTBUG-29950"); -#endif { tst_QScrollerWidget *sw = new tst_QScrollerWidget(); sw->scrollArea = QRectF( 0, 0, 1000, 1000 ); @@ -376,9 +373,6 @@ void tst_QScroller::scrollTo() void tst_QScroller::scroll() { -#ifdef Q_OS_MAC - QSKIP("Flakey test - QTBUG-30133"); -#endif #ifndef QT_NO_GESTURES // -- good case. normal scroll tst_QScrollerWidget *sw = new tst_QScrollerWidget(); @@ -419,9 +413,6 @@ void tst_QScroller::scroll() void tst_QScroller::overshoot() { -#ifdef Q_OS_MAC - QSKIP("Flakey test - QTBUG-29950"); -#endif #ifndef QT_NO_GESTURES tst_QScrollerWidget *sw = new tst_QScrollerWidget(); sw->scrollArea = QRectF(0, 0, 1000, 1000); |