whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <jake.petroules@theqtcompany.com>
bb10
Erik Verbruggen 2015-12-10 15:23:39 +01:00 committed by Erik Verbruggen
parent 068baa9bb6
commit 74c0416c99
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/painting/qpaintengine_blitter_p.h
View File

@ -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;

2
src/gui/painting/qpaintengine_raster_p.h
View File

@ -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;