Make the GLX integration give more correct format

Also create a correct window for the format.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp
index 3d5b74f95a..5f0bca3ab9 100644
--- a/src/opengl/qgl_qpa.cpp
+++ b/src/opengl/qgl_qpa.cpp
@@ -105,7 +105,8 @@ static QPlatformWindowFormat qt_glformat_to_platformwindowformat(const QGLFormat
         retFormat.setRedBufferSize(format.redBufferSize());
     retFormat.setRgba(format.rgba());
     retFormat.setSampleBuffers(format.sampleBuffers());
-    retFormat.setSamples(format.sampleBuffers());
+    if (format.samples() >= 0)
+        retFormat.setSamples(format.samples());
     retFormat.setStencil(format.stencil());
     if (format.stencilBufferSize() >= 0)
         retFormat.setStencilBufferSize(format.stencilBufferSize());