diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-16 01:00:32 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-16 01:00:33 +0200 |
| commit | 56f46ba13dd9273b4be4e8f1f1f867a6feff04da (patch) | |
| tree | c05a8f2bea5f645eaff32a5aa0380a9704366b6e /src/platformsupport/glxconvenience/qglxconvenience.cpp | |
| parent | 37bae591b7829cd8ac6a9c8556bbe6b96b365bc3 (diff) | |
| parent | 66a1975200c5ec106205522c37e32f990df84883 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ia3645f92b9debf3e1fe2d972300c7d0dbd649268
Diffstat (limited to 'src/platformsupport/glxconvenience/qglxconvenience.cpp')
| -rw-r--r-- | src/platformsupport/glxconvenience/qglxconvenience.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/platformsupport/glxconvenience/qglxconvenience.cpp b/src/platformsupport/glxconvenience/qglxconvenience.cpp index 948b00596f..81bccb1c25 100644 --- a/src/platformsupport/glxconvenience/qglxconvenience.cpp +++ b/src/platformsupport/glxconvenience/qglxconvenience.cpp @@ -261,9 +261,11 @@ GLXFBConfig qglx_findConfig(Display *display, int screen , QSurfaceFormat format qCDebug(lcGlx) << "qglx_findConfig: Found non-matching but compatible FBConfig"; return compatibleCandidate; } - qCWarning(lcGlx, "qglx_findConfig: Failed to finding matching FBConfig (%d %d %d %d)", requestedRed, requestedGreen, requestedBlue, requestedAlpha); } while (qglx_reduceFormat(&format)); + if (!config) + qCWarning(lcGlx) << "qglx_findConfig: Failed to finding matching FBConfig for" << format; + return config; } |