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/qquickwindow/tst_qquickwindow.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/qquickwindow/tst_qquickwindow.cpp')
| -rw-r--r-- | tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index eed81389f6..0e4ad86260 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -1240,9 +1240,10 @@ void tst_qquickwindow::headless() QSignalSpy initialized(window, SIGNAL(sceneGraphInitialized())); QSignalSpy invalidated(window, SIGNAL(sceneGraphInvalidated())); +#ifndef QT_NO_OPENGL // Verify that the window is alive and kicking QVERIFY(window->openglContext() != 0); - +#endif // Store the visual result QImage originalContent = window->grabWindow(); @@ -1270,7 +1271,9 @@ void tst_qquickwindow::headless() if (threaded) QTRY_COMPARE(initialized.size(), 1); +#ifndef QT_NO_OPENGL QVERIFY(window->openglContext() != 0); +#endif // Verify that the visual output is the same QImage newContent = window->grabWindow(); @@ -1643,7 +1646,9 @@ void tst_qquickwindow::hideThenDelete() } QVERIFY(sgInvalidated->size() > 0); +#ifndef QT_NO_OPENGL QVERIFY(openglDestroyed->size() > 0); +#endif } void tst_qquickwindow::showHideAnimate() |