From aa90f78a34bb1b8b0d185504c97b0b5cec5c66da Mon Sep 17 00:00:00 2001
From: Sean Harmer <sean.harmer@kdab.com>
Date: Mon, 31 Dec 2012 12:56:56 +0000
Subject: Fix bug in multisampling handling when converting from surface format
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTBUG-28875

Change-Id: If72ce0669de8f344603d2da53eeb5644bd5c4f82
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
---
 src/opengl/qgl_qpa.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/opengl/qgl_qpa.cpp')

diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp
index 88736ecdb7..fa94b7cc37 100644
--- a/src/opengl/qgl_qpa.cpp
+++ b/src/opengl/qgl_qpa.cpp
@@ -70,8 +70,8 @@ QGLFormat QGLFormat::fromSurfaceFormat(const QSurfaceFormat &format)
     if (format.depthBufferSize() >= 0)
         retFormat.setDepthBufferSize(format.depthBufferSize());
     if (format.samples() > 1) {
-        retFormat.setSampleBuffers(format.samples());
-        retFormat.setSamples(true);
+        retFormat.setSampleBuffers(true);
+        retFormat.setSamples(format.samples());
     }
     if (format.stencilBufferSize() > 0) {
         retFormat.setStencil(true);
-- 
cgit v1.2.3