Merge remote-tracking branch 'origin/5.7' into 5.8.0

Change-Id: I576187a9905802c177ae483e6c29d0f55cf7034d

4 files changed, 35 insertions, 35 deletions

diff --git a/src/gui/painting/qemulationpaintengine_p.h b/src/gui/painting/qemulationpaintengine_p.h
index 457cc06d63..a2eb9b008c 100644
--- a/src/gui/painting/qemulationpaintengine_p.h
+++ b/src/gui/painting/qemulationpaintengine_p.h
@@ -62,37 +62,37 @@ class QEmulationPaintEngine : public QPaintEngineEx
 public:
     QEmulationPaintEngine(QPaintEngineEx *engine);
 
-    virtual bool begin(QPaintDevice *pdev);
-    virtual bool end();
+    bool begin(QPaintDevice *pdev) override;
+    bool end() override;
 
-    virtual Type type() const;
-    virtual QPainterState *createState(QPainterState *orig) const;
+    Type type() const override;
+    QPainterState *createState(QPainterState *orig) const override;
 
-    virtual void fill(const QVectorPath &path, const QBrush &brush);
-    virtual void stroke(const QVectorPath &path, const QPen &pen);
-    virtual void clip(const QVectorPath &path, Qt::ClipOperation op);
+    void fill(const QVectorPath &path, const QBrush &brush) override;
+    void stroke(const QVectorPath &path, const QPen &pen) override;
+    void clip(const QVectorPath &path, Qt::ClipOperation op) override;
 
-    virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr);
-    virtual void drawTextItem(const QPointF &p, const QTextItem &textItem);
-    virtual void drawStaticTextItem(QStaticTextItem *item);
-    virtual void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s);
-    virtual void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, Qt::ImageConversionFlags flags);
+    void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override;
+    void drawTextItem(const QPointF &p, const QTextItem &textItem) override;
+    void drawStaticTextItem(QStaticTextItem *item) override;
+    void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s) override;
+    void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, Qt::ImageConversionFlags flags) override;
 
-    virtual void clipEnabledChanged();
-    virtual void penChanged();
-    virtual void brushChanged();
-    virtual void brushOriginChanged();
-    virtual void opacityChanged();
-    virtual void compositionModeChanged();
-    virtual void renderHintsChanged();
-    virtual void transformChanged();
+    void clipEnabledChanged() override;
+    void penChanged() override;
+    void brushChanged() override;
+    void brushOriginChanged() override;
+    void opacityChanged() override;
+    void compositionModeChanged() override;
+    void renderHintsChanged() override;
+    void transformChanged() override;
 
-    virtual void setState(QPainterState *s);
+    void setState(QPainterState *s) override;
 
-    virtual void beginNativePainting();
-    virtual void endNativePainting();
+    void beginNativePainting() override;
+    void endNativePainting() override;
 
-    virtual uint flags() const {return QPaintEngineEx::IsEmulationEngine | QPaintEngineEx::DoNotEmulate;}
+    uint flags() const override { return QPaintEngineEx::IsEmulationEngine | QPaintEngineEx::DoNotEmulate; }
 
     inline QPainterState *state() { return (QPainterState *)QPaintEngine::state; }
     inline const QPainterState *state() const { return (const QPainterState *)QPaintEngine::state; }
diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h
index 8cde88fa82..59213220a6 100644
--- a/src/gui/painting/qpaintengine_raster_p.h
+++ b/src/gui/painting/qpaintengine_raster_p.h
@@ -287,7 +287,7 @@ public:
     void rasterize(QT_FT_Outline *outline, ProcessSpans callback, void *userData, QRasterBuffer *rasterBuffer);
     void updateMatrixData(QSpanData *spanData, const QBrush &brush, const QTransform &brushMatrix);
 
-    void systemStateChanged();
+    void systemStateChanged() override;
 
     void drawImage(const QPointF &pt, const QImage &img, SrcOverBlendFunc func,
                    const QRect &clip, int alpha, const QRect &sr = QRect());
diff --git a/src/gui/painting/qpdfwriter.h b/src/gui/painting/qpdfwriter.h
index baad274818..17c73dd480 100644
--- a/src/gui/painting/qpdfwriter.h
+++ b/src/gui/painting/qpdfwriter.h
@@ -67,7 +67,7 @@ public:
     QString creator() const;
     void setCreator(const QString &creator);
 
-    bool newPage();
+    bool newPage() override;
 
     void setResolution(int resolution);
     int resolution() const;
@@ -83,14 +83,14 @@ public:
     using QPagedPaintDevice::setPageSize;
 #endif
 
-    void setPageSize(PageSize size);
-    void setPageSizeMM(const QSizeF &size);
+    void setPageSize(PageSize size) override;
+    void setPageSizeMM(const QSizeF &size) override;
 
-    void setMargins(const Margins &m);
+    void setMargins(const Margins &m) override;
 
 protected:
-    QPaintEngine *paintEngine() const;
-    int metric(PaintDeviceMetric id) const;
+    QPaintEngine *paintEngine() const override;
+    int metric(PaintDeviceMetric id) const override;
 
 private:
     Q_DISABLE_COPY(QPdfWriter)
diff --git a/src/gui/painting/qstroker_p.h b/src/gui/painting/qstroker_p.h
index ededb5d80b..1a7c184e1a 100644
--- a/src/gui/painting/qstroker_p.h
+++ b/src/gui/painting/qstroker_p.h
@@ -234,7 +234,7 @@ protected:
     static Qt::PenJoinStyle joinForJoinMode(LineJoinMode mode);
     static LineJoinMode joinModeForJoin(Qt::PenJoinStyle joinStyle);
 
-    virtual void processCurrentSubpath();
+    void processCurrentSubpath() override;
 
     qfixed m_strokeWidth;
     qfixed m_miterLimit;
@@ -265,14 +265,14 @@ public:
     void setDashOffset(qreal offset) { m_dashOffset = offset; }
     qreal dashOffset() const { return m_dashOffset; }
 
-    virtual void begin(void *data);
-    virtual void end();
+    void begin(void *data) override;
+    void end() override;
 
     inline void setStrokeWidth(qreal width) { m_stroke_width = width; }
     inline void setMiterLimit(qreal limit) { m_miter_limit = limit; }
 
 protected:
-    virtual void processCurrentSubpath();
+    void processCurrentSubpath() override;
 
     QStroker *m_stroker;
     QVector<qfixed> m_dashPattern;