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

3 files changed, 12 insertions, 12 deletions

diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
index 36a8c9d4..556ed687 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
@@ -57,10 +57,10 @@ class QWaylandEglWindow : public QWaylandWindow
 public:
     QWaylandEglWindow(QWindow *window);
     ~QWaylandEglWindow();
-    WindowType windowType() const;
+    WindowType windowType() const Q_DECL_OVERRIDE;
 
     void updateSurface(bool create);
-    virtual void setGeometry(const QRect &rect);
+    virtual void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
     QRect contentsRect() const;
 
     EGLSurface eglSurface() const;
@@ -68,7 +68,7 @@ public:
     GLuint contentTexture() const;
     bool needToUpdateContentFBO() const { return decoration() && (m_resize || !m_contentFBO); }
 
-    QSurfaceFormat format() const;
+    QSurfaceFormat format() const Q_DECL_OVERRIDE;
 
     void bindContentFBO();
 
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
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
index fec1addd..d513eefa 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
@@ -63,19 +63,19 @@ public:
     QWaylandGLContext(EGLDisplay eglDisplay, QWaylandDisplay *display, const QSurfaceFormat &format, QPlatformOpenGLContext *share);
     ~QWaylandGLContext();
 
-    void swapBuffers(QPlatformSurface *surface);
+    void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE;
 
-    bool makeCurrent(QPlatformSurface *surface);
-    void doneCurrent();
+    bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE;
+    void doneCurrent() Q_DECL_OVERRIDE;
 
-    GLuint defaultFramebufferObject(QPlatformSurface *surface) const;
+    GLuint defaultFramebufferObject(QPlatformSurface *surface) const Q_DECL_OVERRIDE;
 
-    bool isSharing() const;
-    bool isValid() const;
+    bool isSharing() const Q_DECL_OVERRIDE;
+    bool isValid() const Q_DECL_OVERRIDE;
 
-    void (*getProcAddress(const char *procName)) ();
+    void (*getProcAddress(const char *procName)) () Q_DECL_OVERRIDE;
 
-    QSurfaceFormat format() const { return m_format; }
+    QSurfaceFormat format() const Q_DECL_OVERRIDE { return m_format; }
 
     EGLConfig eglConfig() const;
     EGLContext eglContext() const { return m_context; }