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

Conflicts:
	src/corelib/tools/qbytearray.cpp
	src/gui/image/qimage.cpp
	src/gui/image/qppmhandler.cpp
	src/gui/kernel/qguiapplication.cpp
	src/gui/painting/qpaintengine_raster.cpp

Change-Id: I7c1a8e7ebdfd7f7ae767fdb932823498a7660765

1 files changed, 14 insertions, 21 deletions

diff --git a/src/gui/kernel/qopenglwindow.cpp b/src/gui/kernel/qopenglwindow.cpp
index c09cd186a6..2b6692c461 100644
--- a/src/gui/kernel/qopenglwindow.cpp
+++ b/src/gui/kernel/qopenglwindow.cpp
@@ -5,36 +5,28 @@
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
 ** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
+** rights. These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -220,7 +212,7 @@ public:
         }
 
         if (updateBehavior > QOpenGLWindow::NoPartialUpdate) {
-            if (!fbo || fbo->size() != q->size()) {
+            if (!fbo || fbo->size() != q->size() * q->devicePixelRatio()) {
                 QOpenGLFramebufferObjectFormat fboFormat;
                 fboFormat.setAttachment(QOpenGLFramebufferObject::CombinedDepthStencil);
                 if (q->requestedFormat().samples() > 0) {
@@ -229,7 +221,7 @@ public:
                     else
                         qWarning("QOpenGLWindow: PartialUpdateBlend does not support multisampling");
                 }
-                fbo.reset(new QOpenGLFramebufferObject(q->size(), fboFormat));
+                fbo.reset(new QOpenGLFramebufferObject(q->size() * q->devicePixelRatio(), fboFormat));
                 markWindowAsDirty();
             }
         } else {
@@ -239,6 +231,7 @@ public:
         const int deviceWidth = q->width() * q->devicePixelRatio();
         const int deviceHeight = q->height() * q->devicePixelRatio();
         paintDevice->setSize(QSize(deviceWidth, deviceHeight));
+        paintDevice->setDevicePixelRatio(q->devicePixelRatio());
         context->functions()->glViewport(0, 0, deviceWidth, deviceHeight);
 
         context->functions()->glBindFramebuffer(GL_FRAMEBUFFER, context->defaultFramebufferObject());
@@ -273,7 +266,7 @@ public:
             if (!blitter.isCreated())
                 blitter.create();
 
-            QRect windowRect(QPoint(0, 0), q->size());
+            QRect windowRect(QPoint(0, 0), fbo->size());
             QMatrix4x4 target = QOpenGLTextureBlitter::targetTransform(windowRect, windowRect);
             blitter.bind();
             blitter.blit(fbo->texture(), target, QOpenGLTextureBlitter::OriginBottomLeft);