summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2017-04-01 21:08:38 -0700
committerThiago Macieira <thiago.macieira@intel.com>2017-04-04 06:53:23 +0000
commitc26f8dbd5c5ff15167e90db529845091705cbe46 (patch)
tree8ae9e9fa0a9bdf9b1d3db54db8746a3f33d9dd12
parentcd6de5d1f99f4c72476fda0812fa4f0fc73fdada (diff)
Fix warning about inconsistent use of override keywordv5.9.0-beta2
qwaylandshmbackingstore_p.h:93:19: warning: 'paintDevice' overrides a member function but is not marked 'override' [-Winconsistent-missing- override Change-Id: I27b55fdf514247549455fffd14b1791d4dd6b6b3 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
-rw-r--r--src/client/qwaylandshmbackingstore_p.h2
-rw-r--r--src/compositor/wayland_wrapper/qwlclientbuffer_p.h2
-rw-r--r--src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h2
-rw-r--r--src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h2
-rw-r--r--src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h4
-rw-r--r--src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h2
6 files changed, 7 insertions, 7 deletions
diff --git a/src/client/qwaylandshmbackingstore_p.h b/src/client/qwaylandshmbackingstore_p.h
index 71f98e30..8564cc9d 100644
--- a/src/client/qwaylandshmbackingstore_p.h
+++ b/src/client/qwaylandshmbackingstore_p.h
@@ -90,7 +90,7 @@ public:
QWaylandShmBackingStore(QWindow *window);
~QWaylandShmBackingStore();
- QPaintDevice *paintDevice();
+ QPaintDevice *paintDevice() override;
void flush(QWindow *window, const QRegion &region, const QPoint &offset) override;
void resize(const QSize &size, const QRegion &staticContents) override;
void resize(const QSize &size);
diff --git a/src/compositor/wayland_wrapper/qwlclientbuffer_p.h b/src/compositor/wayland_wrapper/qwlclientbuffer_p.h
index efb2eb18..dbc8a0b7 100644
--- a/src/compositor/wayland_wrapper/qwlclientbuffer_p.h
+++ b/src/compositor/wayland_wrapper/qwlclientbuffer_p.h
@@ -130,7 +130,7 @@ public:
QSize size() const override;
QWaylandSurface::Origin origin() const override;
- QImage image() const;
+ QImage image() const override;
#if QT_CONFIG(opengl)
QOpenGLTexture *toOpenGlTexture(int plane = 0) override;
diff --git a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h
index d9072b06..6286f0f2 100644
--- a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h
+++ b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h
@@ -96,7 +96,7 @@ public:
DrmEglServerBufferIntegration();
~DrmEglServerBufferIntegration();
- void initializeHardware(QWaylandCompositor *);
+ void initializeHardware(QWaylandCompositor *) override;
bool supportsFormat(QtWayland::ServerBuffer::Format format) const override;
QtWayland::ServerBuffer *createServerBuffer(const QSize &size, QtWayland::ServerBuffer::Format format) override;
diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
index e0235d84..846cbc3a 100644
--- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
+++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
@@ -53,7 +53,7 @@ public:
void initializeHardware(struct ::wl_display *display) override;
- QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer);
+ QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer) override;
private:
Q_DISABLE_COPY(WaylandEglClientBufferIntegration)
diff --git a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h
index fb869b2e..55e02abe 100644
--- a/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h
+++ b/src/hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h
@@ -67,8 +67,8 @@ class XCompositeEglClientBuffer : public QtWayland::ClientBuffer
public:
XCompositeEglClientBuffer(XCompositeEglClientBufferIntegration *integration, wl_resource *bufferResource);
- QSize size() const;
- QWaylandSurface::Origin origin() const;
+ QSize size() const override;
+ QWaylandSurface::Origin origin() const override;
QOpenGLTexture *toOpenGlTexture(int plane) override;
QWaylandBufferRef::BufferFormatEgl bufferFormatEgl() const override {
return QWaylandBufferRef::BufferFormatEgl_RGBA;
diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h
index 5a0bfbdc..cb3b1bec 100644
--- a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h
+++ b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h
@@ -53,7 +53,7 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandIviShellIntegration : public QWaylandShell
public:
QWaylandIviShellIntegration();
~QWaylandIviShellIntegration();
- bool initialize(QWaylandDisplay *display);
+ bool initialize(QWaylandDisplay *display) override;
virtual QWaylandShellSurface *createShellSurface(QWaylandWindow *window) override;
private: