Skip to content

Commit

Permalink
Fix merge mistake in 'Avoid picking worse formats when ...'
Browse files Browse the repository at this point in the history
When spliting the patch the edit become an addition instead.

Task-number: QTBUG-72785
Change-Id: I92105d0e23e9b8426228f4202d46fa41f928fb94
Reviewed-by: Christian Andersen <[email protected]>
Reviewed-by: Gatis Paeglis <[email protected]>
  • Loading branch information
Allan Sandfeld Jensen committed Jan 31, 2019
1 parent 50447bb commit 4513cf4
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/platformsupport/glxconvenience/qglxconvenience.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 4513cf4

Please sign in to comment.