Merge remote-tracking branch 'origin/5.7' into dev

Conflicts:
	configure
	mkspecs/common/wince/qplatformdefs.h
	src/plugins/platforms/directfb/qdirectfbbackingstore.cpp
	src/plugins/platforms/xcb/qxcbbackingstore.cpp

Change-Id: Ied4d31264a9afca9514b51a7eb1494c28712793c

1 files changed, 3 insertions, 2 deletions

diff --git a/src/gui/kernel/qopenglwindow.cpp b/src/gui/kernel/qopenglwindow.cpp
index 37db6084302..8ab5c084421 100644
--- a/src/gui/kernel/qopenglwindow.cpp
+++ b/src/gui/kernel/qopenglwindow.cpp
@@ -252,9 +252,10 @@ void QOpenGLWindowPrivate::beginPaint(const QRegion &region)
         if (!fbo || fbo->size() != deviceSize) {
             QOpenGLFramebufferObjectFormat fboFormat;
             fboFormat.setAttachment(QOpenGLFramebufferObject::CombinedDepthStencil);
-            if (q->requestedFormat().samples() > 0) {
+            const int samples = q->requestedFormat().samples();
+            if (samples > 0) {
                 if (updateBehavior != QOpenGLWindow::PartialUpdateBlend)
-                    fboFormat.setSamples(q->requestedFormat().samples());
+                    fboFormat.setSamples(samples);
                 else
                     qWarning("QOpenGLWindow: PartialUpdateBlend does not support multisampling");
             }