diff options
| author | Andy Nichols <andy.nichols@qt.io> | 2016-04-26 11:49:52 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@qt.io> | 2016-05-06 19:17:28 +0000 |
| commit | 928915cabe4b8efacf9766962b60f895f51b6b98 (patch) | |
| tree | 708242f045390621702d3c94251cfdea7ab36ab7 /tests/auto/quick/qquickflickable/tst_qquickflickable.cpp | |
| parent | 11e788c9a555694f3ec5c4839eb98c4048801bf2 (diff) | |
Fix some test failures with QT_NO_OPENGL builds
Change-Id: I4154084b4a0e0709ee8cb39a856a37a611e2d537
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'tests/auto/quick/qquickflickable/tst_qquickflickable.cpp')
| -rw-r--r-- | tests/auto/quick/qquickflickable/tst_qquickflickable.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp index 006c55542a..2742f5c1e2 100644 --- a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp +++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp @@ -1137,7 +1137,9 @@ void tst_qquickflickable::flickOnRelease() QTRY_VERIFY(!flickable->isMoving()); #ifdef Q_OS_MAC +# ifndef QT_NO_OPENGL QEXPECT_FAIL("", "QTBUG-26094 stopping on a full pixel doesn't work on OS X", Continue); +# endif #endif // Stop on a full pixel after user interaction QCOMPARE(flickable->contentY(), (qreal)qRound(flickable->contentY())); |