summaryrefslogtreecommitdiff
path: root/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-12-12 09:48:59 +0100
committerLiang Qi <liang.qi@qt.io>2016-12-12 09:48:59 +0100
commit2856c5e52bdd2cb736d8394dd87a0726ea5fb560 (patch)
treea71e216d3ef7abd75647146284c91199c256bf13 /src/plugins/iconengines/svgiconengine/qsvgiconengine.h
parent3246c09fa5dd9c9354be8ec7d41fa5d5a57f0d0e (diff)
parenteb74919884f14c0ceebb63d512768ea1c8823b84 (diff)
downloadqtsvg-2856c5e52bdd2cb736d8394dd87a0726ea5fb560.tar.gz
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: Iaac1c139f074e4e82267654a2fbfdcf0a3f5e71c
Diffstat (limited to 'src/plugins/iconengines/svgiconengine/qsvgiconengine.h')
-rw-r--r--src/plugins/iconengines/svgiconengine/qsvgiconengine.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.h b/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
index 495a8b0..cf4f255 100644
--- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
+++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
@@ -54,21 +54,21 @@ public:
QSvgIconEngine(const QSvgIconEngine &other);
~QSvgIconEngine();
void paint(QPainter *painter, const QRect &rect,
- QIcon::Mode mode, QIcon::State state);
+ QIcon::Mode mode, QIcon::State state) override;
QSize actualSize(const QSize &size, QIcon::Mode mode,
- QIcon::State state);
+ QIcon::State state) override;
QPixmap pixmap(const QSize &size, QIcon::Mode mode,
- QIcon::State state);
+ QIcon::State state) override;
void addPixmap(const QPixmap &pixmap, QIcon::Mode mode,
- QIcon::State state);
+ QIcon::State state) override;
void addFile(const QString &fileName, const QSize &size,
- QIcon::Mode mode, QIcon::State state);
+ QIcon::Mode mode, QIcon::State state) override;
- QString key() const;
- QIconEngine *clone() const;
- bool read(QDataStream &in);
- bool write(QDataStream &out) const;
+ QString key() const override;
+ QIconEngine *clone() const override;
+ bool read(QDataStream &in) override;
+ bool write(QDataStream &out) const override;
private:
QSharedDataPointer<QSvgIconEnginePrivate> d;