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/qquickitemlayer | |
| 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/qquickitemlayer')
| -rw-r--r-- | tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp index 6cfe43fd9f..d991f189fc 100644 --- a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp +++ b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp @@ -60,9 +60,10 @@ private slots: void initTestCase() Q_DECL_OVERRIDE; void layerEnabled(); void layerSmooth(); +#ifndef QT_NO_OPENGL void layerMipmap(); void layerEffect(); - +#endif void layerVisibility_data(); void layerVisibility(); @@ -169,8 +170,7 @@ void tst_QQuickItemLayer::layerEnabled() QVERIFY(fb.pixel(0, 0) != fb.pixel(0, fb.height() - 1)); } - - +#ifndef QT_NO_OPENGL // The test draws a one pixel wide line and scales it down by more than a a factor 2 // If mipmpping works, the pixels should be gray, not white or black @@ -196,8 +196,7 @@ void tst_QQuickItemLayer::layerEffect() QCOMPARE(fb.pixel(0, 0), qRgb(0xff, 0, 0)); QCOMPARE(fb.pixel(fb.width() - 1, 0), qRgb(0, 0xff, 0)); } - - +#endif // The test draws a rectangle and verifies that there is padding on each side // as the source rect spans outside the item. The padding is verified using |