diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-30 08:10:08 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-06-30 10:20:40 +0200 |
| commit | cddeb1c7c0e9d02c5f5542d7d12b4fa992bfb050 (patch) | |
| tree | c377fea4c9ffc0c6aff9619698ad95773e648e94 /src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h | |
| parent | 1723bf4fc62a43c4dd0e7724aab6231c0309c114 (diff) | |
| parent | 00a65be5ae8e1253ed6fd1f2e1df745f4c319de5 (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/qwaylandeglwindow.h')
| -rw-r--r-- | src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h index 36a8c9d4d..556ed6879 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(); |