From 7183fc8f0d2d1e16c52fe78d029ee9fa13868b79 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Sat, 26 Nov 2016 12:40:58 +0300 Subject: Add missing override into Qt modules Change-Id: I014ac8c7b590c77b054fbb01f0ab5601c44ca88e Reviewed-by: hjk --- src/opengl/gl2paintengineex/qglgradientcache_p.h | 4 ++-- src/opengl/qglpixelbuffer_p.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/opengl') diff --git a/src/opengl/gl2paintengineex/qglgradientcache_p.h b/src/opengl/gl2paintengineex/qglgradientcache_p.h index 1333df316b..3c9da982e9 100644 --- a/src/opengl/gl2paintengineex/qglgradientcache_p.h +++ b/src/opengl/gl2paintengineex/qglgradientcache_p.h @@ -83,8 +83,8 @@ public: GLuint getBuffer(const QGradient &gradient, qreal opacity); inline int paletteSize() const { return 1024; } - void invalidateResource(); - void freeResource(QOpenGLContext *ctx); + void invalidateResource() override; + void freeResource(QOpenGLContext *ctx) override; private: inline int maxCacheSize() const { return 60; } diff --git a/src/opengl/qglpixelbuffer_p.h b/src/opengl/qglpixelbuffer_p.h index 6416e41773..9125fcfb4b 100644 --- a/src/opengl/qglpixelbuffer_p.h +++ b/src/opengl/qglpixelbuffer_p.h @@ -63,11 +63,11 @@ class QOpenGLFramebufferObject; class QGLPBufferGLPaintDevice : public QGLPaintDevice { public: - virtual QPaintEngine* paintEngine() const {return pbuf->paintEngine();} - virtual QSize size() const {return pbuf->size();} - virtual QGLContext* context() const; - virtual void beginPaint(); - virtual void endPaint(); + QPaintEngine* paintEngine() const override {return pbuf->paintEngine();} + QSize size() const override {return pbuf->size();} + QGLContext* context() const override; + void beginPaint() override; + void endPaint() override; void setPBuffer(QGLPixelBuffer* pb); void setFbo(GLuint fbo); private: -- cgit v1.2.3