summaryrefslogtreecommitdiffstats
path: root/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-06-30 08:10:08 +0200
committerPaul Olav Tvete <paul.tvete@qt.io>2016-06-30 10:20:40 +0200
commitcddeb1c7c0e9d02c5f5542d7d12b4fa992bfb050 (patch)
treec377fea4c9ffc0c6aff9619698ad95773e648e94 /src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
parent1723bf4fc62a43c4dd0e7724aab6231c0309c114 (diff)
parent00a65be5ae8e1253ed6fd1f2e1df745f4c319de5 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts: src/client/qwaylandinputcontext_p.h src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h Change-Id: Iac517e1985e4e67d7ca00ca4c10dcda9dd9079f9
Diffstat (limited to 'src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp')
-rw-r--r--src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
index bd835b7e..72e7b0e6 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
@@ -209,7 +209,7 @@ public:
m_blitProgram->setAttributeArray(0, squareVertices, 2);
glBindTexture(GL_TEXTURE_2D, window->contentTexture());
QRect r = window->contentsRect();
- glViewport(r.x(), r.y(), r.width() * scale, r.height() * scale);
+ glViewport(r.x() * scale, r.y() * scale, r.width() * scale, r.height() * scale);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
//Cleanup