diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:56:04 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:56:04 +0100 |
| commit | 51ef7e2e9877fbcc8ac0f7dc4d2f17b767b7e765 (patch) | |
| tree | 5d93a54aa4245915d6fdc1dc3c8765d0dd2e8b6b /src/svg/qsvggenerator.cpp | |
| parent | cb2aafdaa09e992982eb3aac318cfde38e65b2ac (diff) | |
| parent | 410b6b529cc6ee9236ee29fcdff4a03ad8670fe9 (diff) | |
| download | qtsvg-51ef7e2e9877fbcc8ac0f7dc4d2f17b767b7e765.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I43247261a4dc8badc4ad4f4d2137cdbd499f29db
Diffstat (limited to 'src/svg/qsvggenerator.cpp')
| -rw-r--r-- | src/svg/qsvggenerator.cpp | 22 |
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) { |