diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-01-31 16:04:38 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-01-31 15:18:45 +0000 |
| commit | 4513cf47f14e63ae1c97fa53555ab9c63914cb7a (patch) | |
| tree | 1d5224e58645beb622e64023be86afa165d60739 /src/platformsupport | |
| parent | 50447bb7a32dcdf5070f769cb9ef26112d2f4c04 (diff) | |
Fix merge mistake in 'Avoid picking worse formats when ...'
When spliting the patch the edit become an addition instead.
Task-number: QTBUG-72785
Change-Id: I92105d0e23e9b8426228f4202d46fa41f928fb94
Reviewed-by: Christian Andersen <csandersen3@gmail.com>
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'src/platformsupport')
| -rw-r--r-- | src/platformsupport/glxconvenience/qglxconvenience.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/platformsupport/glxconvenience/qglxconvenience.cpp b/src/platformsupport/glxconvenience/qglxconvenience.cpp index 238f31994d..6bd73de8f3 100644 --- a/src/platformsupport/glxconvenience/qglxconvenience.cpp +++ b/src/platformsupport/glxconvenience/qglxconvenience.cpp @@ -240,7 +240,6 @@ GLXFBConfig qglx_findConfig(Display *display, int screen , QSurfaceFormat format continue; if (requestedAlpha && actualAlpha < requestedAlpha) continue; - compatibleCandidate = candidate; if (!compatibleCandidate) // Only pick up the first compatible one offered by the server compatibleCandidate = candidate; |