diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2014-11-16 13:09:01 +0100 |
---|---|---|
committer | Olivier Goffart <ogoffart@woboq.com> | 2014-12-03 09:57:11 +0100 |
commit | 5180f32c5abe01acd65cde68c2c16aedda4028ec (patch) | |
tree | a8ed3b4af80751cdc0442c750f2915bfa9c8af40 /src/opengl/qglframebufferobject.h | |
parent | 2e271795e7c460254a27ea617846ff7b598a7b9b (diff) | |
download | qtbase-5180f32c5abe01acd65cde68c2c16aedda4028ec.tar.gz |
Add Q_DECL_OVERRIDE in the src subdirectory
Done automatically with clang-modernize on linux
(But does not add Q_DECL_OVERRIDE to the function that are marked
as inline because it a compilation error with MSVC2010)
Change-Id: I2196ee26e3e6fe20816834ecea5ea389eeab3171
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/opengl/qglframebufferobject.h')
-rw-r--r-- | src/opengl/qglframebufferobject.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/opengl/qglframebufferobject.h b/src/opengl/qglframebufferobject.h index 2382145da1..009254c903 100644 --- a/src/opengl/qglframebufferobject.h +++ b/src/opengl/qglframebufferobject.h @@ -78,7 +78,7 @@ public: QImage toImage() const; Attachment attachment() const; - QPaintEngine *paintEngine() const; + QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; GLuint handle() const; static bool bindDefault(); @@ -95,8 +95,8 @@ public: GLenum filter = GL_NEAREST); protected: - int metric(PaintDeviceMetric metric) const; - int devType() const { return QInternal::FramebufferObject; } + int metric(PaintDeviceMetric metric) const Q_DECL_OVERRIDE; + int devType() const Q_DECL_OVERRIDE { return QInternal::FramebufferObject; } private: Q_DISABLE_COPY(QGLFramebufferObject) |