diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-04 21:21:43 +0200 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-04 21:21:43 +0200 |
commit | 4e158f6bfa7d0747d8da70b3b15a44b52e35bb8a (patch) | |
tree | 84e20982138de5c9b6d319bf83ac79bd672f918f /examples/opengl/contextinfo/widget.cpp | |
parent | e4391422574aa9aa89fece74f16c07c609cbbae2 (diff) | |
parent | a13fd415d689be046c13cc562cbbbb5df0e6506a (diff) |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into tqtc/lts-5.15-opensourcev5.15.13-lts-lgpl
Change-Id: Ie9df84af22570d601db002e391a1a0d97e7cd9e1
Diffstat (limited to 'examples/opengl/contextinfo/widget.cpp')
-rw-r--r-- | examples/opengl/contextinfo/widget.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/examples/opengl/contextinfo/widget.cpp b/examples/opengl/contextinfo/widget.cpp index 0762c91662..0feefb4568 100644 --- a/examples/opengl/contextinfo/widget.cpp +++ b/examples/opengl/contextinfo/widget.cpp @@ -126,7 +126,9 @@ struct Renderable { static struct Renderable renderables[] = { { "default", QSurfaceFormat::DefaultRenderableType }, +#ifndef Q_OS_ANDROID { "OpenGL", QSurfaceFormat::OpenGL }, +#endif { "OpenGL ES", QSurfaceFormat::OpenGLES } }; |