summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@digia.com>2014-03-18 13:36:10 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-20 08:35:24 +0100
commit5e03c4d97f72f96a8fc97aa87f24c41a043048b7 (patch)
tree59a0a1da9840e331c2e7b7a635b143b747b3a7d3 /tests
parent07549de92bcb2e138c2f3c8d555092054a5359db (diff)
QOpenGLWidget retina support.
Use device pixels where appropriate. Change-Id: Ia953e6da4034eecbfccf798701ec1b850eea9d5b Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/manual/qopenglwidget/openglwidget/openglwidget.cpp9
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);