diff options
author | Andy Nichols <andy.nichols@theqtcompany.com> | 2016-05-08 20:17:35 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-05-08 20:04:37 +0000 |
commit | ddbe4ec52b747b3504180a15c7e5a2da3a6332c8 (patch) | |
tree | aa8c9aa421856db1fdebd5817f665f892bc37440 /tests/auto/quick/qquickborderimage | |
parent | 92da3afdb69c52b955f3828ec10574031f094c7d (diff) |
Fix build with QT_NO_OPENGL after rebase
Change-Id: Ia4243de07ec75030bb98f4f6d95f70d88e29fdba
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'tests/auto/quick/qquickborderimage')
-rw-r--r-- | tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp index e1435e739f..40cead6ac0 100644 --- a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp +++ b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp @@ -76,7 +76,9 @@ private slots: void statusChanges_data(); void sourceSizeChanges(); void progressAndStatusChanges(); +#ifndef QT_NO_OPENGL void borderImageMesh(); +#endif private: QQmlEngine engine; @@ -576,7 +578,7 @@ void tst_qquickborderimage::progressAndStatusChanges() delete obj; } - +#ifndef QT_NO_OPENGL void tst_qquickborderimage::borderImageMesh() { QQuickView *window = new QQuickView; @@ -591,7 +593,7 @@ void tst_qquickborderimage::borderImageMesh() QVERIFY(QQuickVisualTestUtil::compareImages(mesh, nonmesh)); } - +#endif QTEST_MAIN(tst_qquickborderimage) #include "tst_qquickborderimage.moc" |