summaryrefslogtreecommitdiff
path: root/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-11-26 12:56:04 +0100
committerLiang Qi <liang.qi@qt.io>2016-11-26 12:56:04 +0100
commit51ef7e2e9877fbcc8ac0f7dc4d2f17b767b7e765 (patch)
tree5d93a54aa4245915d6fdc1dc3c8765d0dd2e8b6b /src/plugins/iconengines/svgiconengine/qsvgiconengine.h
parentcb2aafdaa09e992982eb3aac318cfde38e65b2ac (diff)
parent410b6b529cc6ee9236ee29fcdff4a03ad8670fe9 (diff)
downloadqtsvg-51ef7e2e9877fbcc8ac0f7dc4d2f17b767b7e765.tar.gz
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I43247261a4dc8badc4ad4f4d2137cdbd499f29db
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;