Merge remote-tracking branch 'origin/5.8' into dev

Change-Id: Iaac1c139f074e4e82267654a2fbfdcf0a3f5e71c

1 files changed, 11 insertions, 11 deletions

diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp
index 6bca27f..5829a1a 100644
--- a/src/svg/qsvggenerator.cpp
+++ b/src/svg/qsvggenerator.cpp
@@ -162,22 +162,22 @@ public:
     {
     }
 
-    bool begin(QPaintDevice *device) Q_DECL_OVERRIDE;
-    bool end() Q_DECL_OVERRIDE;
+    bool begin(QPaintDevice *device) override;
+    bool end() override;
 
-    void updateState(const QPaintEngineState &state) Q_DECL_OVERRIDE;
+    void updateState(const QPaintEngineState &state) override;
     void popGroup();
 
-    void drawEllipse(const QRectF &r) Q_DECL_OVERRIDE;
-    void drawPath(const QPainterPath &path) Q_DECL_OVERRIDE;
-    void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE;
-    void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE;
-    void drawRects(const QRectF *rects, int rectCount) Q_DECL_OVERRIDE;
-    void drawTextItem(const QPointF &pt, const QTextItem &item) Q_DECL_OVERRIDE;
+    void drawEllipse(const QRectF &r) override;
+    void drawPath(const QPainterPath &path) override;
+    void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override;
+    void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) override;
+    void drawRects(const QRectF *rects, int rectCount) override;
+    void drawTextItem(const QPointF &pt, const QTextItem &item) override;
     void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr,
-                   Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE;
+                   Qt::ImageConversionFlags flags = Qt::AutoColor) override;
 
-    QPaintEngine::Type type() const Q_DECL_OVERRIDE { return QPaintEngine::SVG; }
+    QPaintEngine::Type type() const override { return QPaintEngine::SVG; }
 
     QSize size() const { return d_func()->size; }
     void setSize(const QSize &size) {