diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-10-27 09:49:24 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-10-28 10:01:31 +0000 |
| commit | 8d9c42e36217e14efa69974c2cdc8d90f465a959 (patch) | |
| tree | 400c823ff8d3513a041f7d337fe7b3ea61aaa3de /src/platformsupport | |
| parent | af0d0b9c06c18850626e5454b39b45255c3e36cb (diff) | |
xcb: Avoid crash when requesting non-supported stereo formats
Introduced in the 5.7 branch by 5f39a0ef8d037ed8d1fa19d5514308ed4a2ca161.
Add also a warning in the GLX backend instead of just dereferencing the
null pointer.
Task-number: QTBUG-55291
Change-Id: I1f2930768b39a04ee443a68d0ac7dc9ecf26cb9c
Reviewed-by: Louai Al-Khanji <louai.al-khanji@qt.io>
Diffstat (limited to 'src/platformsupport')
| -rw-r--r-- | src/platformsupport/glxconvenience/qglxconvenience.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/platformsupport/glxconvenience/qglxconvenience.cpp b/src/platformsupport/glxconvenience/qglxconvenience.cpp index 7dc29fae6d..4225bebf37 100644 --- a/src/platformsupport/glxconvenience/qglxconvenience.cpp +++ b/src/platformsupport/glxconvenience/qglxconvenience.cpp @@ -386,5 +386,10 @@ bool qglx_reduceFormat(QSurfaceFormat *format) return true; } + if (format->stereo()) { + format->setStereo(false); + return true; + } + return false; } |