From 74c0416c9968d657d2baadea76bdda3948ddd6c3 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Thu, 10 Dec 2015 15:23:39 +0100 Subject: Fix inconsistent override warnings. For example: ../../include/QtGui/5.7.0/QtGui/private/../../../../../../../../qt5-dev/qtbase/src/gui/painting/qpaintengine_blitter_p.h:67:18: warning: 'end' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] Change-Id: I2845d8e4b5a7e11c57ac1933a6d152df1ef5d07f Reviewed-by: Jake Petroules --- src/gui/painting/qpaintengine_blitter_p.h | 7 ++++--- src/gui/painting/qpaintengine_raster_p.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/gui') diff --git a/src/gui/painting/qpaintengine_blitter_p.h b/src/gui/painting/qpaintengine_blitter_p.h index ceecf3f898..17a648176c 100644 --- a/src/gui/painting/qpaintengine_blitter_p.h +++ b/src/gui/painting/qpaintengine_blitter_p.h @@ -60,10 +60,11 @@ class Q_GUI_EXPORT QBlitterPaintEngine : public QRasterPaintEngine public: QBlitterPaintEngine(QBlittablePlatformPixmap *p); - virtual QPaintEngine::Type type() const { return Blitter; } + virtual QPaintEngine::Type type() const Q_DECL_OVERRIDE + { return Blitter; } - virtual bool begin(QPaintDevice *pdev); - virtual bool end(); + virtual bool begin(QPaintDevice *pdev) Q_DECL_OVERRIDE; + virtual bool end() Q_DECL_OVERRIDE; // Call down into QBlittable void fill(const QVectorPath &path, const QBrush &brush) Q_DECL_OVERRIDE; diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h index 93b9dfdc9b..7ac1630692 100644 --- a/src/gui/painting/qpaintengine_raster_p.h +++ b/src/gui/painting/qpaintengine_raster_p.h @@ -222,7 +222,7 @@ public: Type type() const Q_DECL_OVERRIDE { return Raster; } - QPoint coordinateOffset() const; + QPoint coordinateOffset() const Q_DECL_OVERRIDE; bool requiresPretransformedGlyphPositions(QFontEngine *fontEngine, const QTransform &m) const Q_DECL_OVERRIDE; bool shouldDrawCachedGlyphs(QFontEngine *fontEngine, const QTransform &m) const Q_DECL_OVERRIDE; -- cgit v1.2.3