diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2020-03-20 11:18:17 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-03-20 11:28:14 +0100 |
| commit | 69a5be7ef0475ba748ffbe50017c73e44a23a051 (patch) | |
| tree | d29043898dba33596e3eb2ee51645b3330a87a88 /src/platformsupport/glxconvenience | |
| parent | 0359a82e6ef538316e550e7fa7c6dee8db72a225 (diff) | |
| parent | fcbbe7ff21a263f7fafb189caff4b662d4da7eda (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ib2a2e3a292af43be3a980c2ccc943c08f4bbf72f
Diffstat (limited to 'src/platformsupport/glxconvenience')
| -rw-r--r-- | src/platformsupport/glxconvenience/qglxconvenience.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/platformsupport/glxconvenience/qglxconvenience.cpp b/src/platformsupport/glxconvenience/qglxconvenience.cpp index 5387214e8c..823adf52ea 100644 --- a/src/platformsupport/glxconvenience/qglxconvenience.cpp +++ b/src/platformsupport/glxconvenience/qglxconvenience.cpp @@ -224,6 +224,8 @@ GLXFBConfig qglx_findConfig(Display *display, int screen , QSurfaceFormat format } QXlibPointer<XVisualInfo> visual(glXGetVisualFromFBConfig(display, candidate)); + if (!visual) + continue; int actualRed; int actualGreen; int actualBlue; |