diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-11 16:19:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-11 16:19:28 +0200 |
| commit | 0a3d8caa793c5412ccbba69ebe04178c65ab1040 (patch) | |
| tree | 4dd8a0422d33daed4304bed89a9356df9d1724e9 | |
| parent | 8c860e474b4fac4e34a2056f1e4532517c20fd61 (diff) | |
| parent | 7e767afb429910adc0e9a219c5d600b55f6d72d1 (diff) | |
| download | qtsvg-0a3d8caa793c5412ccbba69ebe04178c65ab1040.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I5c6805b48d62c913ed6e8e1e0efb20013b34cba6
| -rw-r--r-- | src/svg/qsvggenerator.cpp | 18 | ||||
| -rw-r--r-- | tests/auto/headersclean/headersclean.pro | 3 | ||||
| -rw-r--r-- | tests/auto/host.pro | 2 |
3 files changed, 10 insertions, 13 deletions
diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp index 6ffab05..ca99de1 100644 --- a/src/svg/qsvggenerator.cpp +++ b/src/svg/qsvggenerator.cpp @@ -156,22 +156,22 @@ public: { } - bool begin(QPaintDevice *device); - bool end(); + bool begin(QPaintDevice *device) Q_DECL_OVERRIDE; + bool end() Q_DECL_OVERRIDE; - void updateState(const QPaintEngineState &state); + void updateState(const QPaintEngineState &state) Q_DECL_OVERRIDE; void popGroup(); void drawEllipse(const QRectF &r) Q_DECL_OVERRIDE; - void drawPath(const QPainterPath &path); - void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr); - void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode); + 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); + void drawTextItem(const QPointF &pt, const QTextItem &item) Q_DECL_OVERRIDE; void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, - Qt::ImageConversionFlags flags = Qt::AutoColor); + Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE; - QPaintEngine::Type type() const { return QPaintEngine::SVG; } + QPaintEngine::Type type() const Q_DECL_OVERRIDE { return QPaintEngine::SVG; } QSize size() const { return d_func()->size; } void setSize(const QSize &size) { diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro deleted file mode 100644 index aefdf18..0000000 --- a/tests/auto/headersclean/headersclean.pro +++ /dev/null @@ -1,3 +0,0 @@ -QT = svg -load(qt_headersclean) -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/host.pro b/tests/auto/host.pro index 6bc8753..4095052 100644 --- a/tests/auto/host.pro +++ b/tests/auto/host.pro @@ -1,4 +1,4 @@ TEMPLATE=subdirs SUBDIRS=\ - headersclean \ + |