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

Conflicts:
	src/gui/image/qjpeghandler.cpp

Change-Id: I9db3acea7d5c82f5da679c8eaeb29431136665f0

1 files changed, 5 insertions, 4 deletions

diff --git a/tests/manual/qopenglwidget/openglwidget/openglwidget.cpp b/tests/manual/qopenglwidget/openglwidget/openglwidget.cpp
index 5752326911..bec89b6b41 100644
--- a/tests/manual/qopenglwidget/openglwidget/openglwidget.cpp
+++ b/tests/manual/qopenglwidget/openglwidget/openglwidget.cpp
@@ -61,8 +61,8 @@
 class OpenGLWidgetPrivate
 {
 public:
-    OpenGLWidgetPrivate()
-        : m_program(0), m_frame(0)
+    OpenGLWidgetPrivate(QWidget *q)
+        : m_program(0), m_frame(0), q(q)
     {
 
     }
@@ -82,13 +82,14 @@ public:
     int m_frame;
 
     int w,h;
+    QWidget *q;
 };
 
 
 OpenGLWidget::OpenGLWidget(QWidget *parent)
     : QOpenGLWidget(parent)
 {
-    d = new OpenGLWidgetPrivate;
+    d = new OpenGLWidgetPrivate(this);
     QTimer *timer = new QTimer(this);
     connect(timer, SIGNAL(timeout()), this, SLOT(updateGL()));
     timer->start(30);
@@ -147,7 +148,7 @@ void OpenGLWidgetPrivate::initialize()
 
 void OpenGLWidgetPrivate::render()
 {
-    const qreal retinaScale = 1.0;//devicePixelRatio();
+    const qreal retinaScale = q->devicePixelRatio();
     glViewport(0, 0, width() * retinaScale, height() * retinaScale);
 
     glClearColor(0.0, 0.0, 0.0, 1.0);