summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-02 01:01:12 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-02 01:01:12 +0100
commitab6affac107cb97e7b6decbe55621259cb8a9b92 (patch)
tree70e427676c20abcd21b1354b803682b65986b2e5 /tests/auto/gui
parent89f1f14c5e9a49f25345a65d81b3518d58ecb91a (diff)
parent44a26a0a79ed07b829d55979eaed6f06346ca450 (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Diffstat (limited to 'tests/auto/gui')
-rw-r--r--tests/auto/gui/rhi/qrhi/tst_qrhi.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp
index 768b227ecd..533d6b17b1 100644
--- a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp
+++ b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp
@@ -1590,6 +1590,9 @@ void tst_QRhi::renderToWindowSimple()
QScopedPointer<QWindow> window(new QWindow);
switch (impl) {
case QRhi::OpenGLES2:
+#if QT_CONFIG(opengl)
+ window->setFormat(QRhiGles2InitParams::adjustedFormat());
+#endif
Q_FALLTHROUGH();
case QRhi::D3D11:
window->setSurfaceType(QSurface::OpenGLSurface);