diff options
author | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:48:59 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:48:59 +0100 |
commit | 2856c5e52bdd2cb736d8394dd87a0726ea5fb560 (patch) | |
tree | a71e216d3ef7abd75647146284c91199c256bf13 /src/svg/qsvgwidget.h | |
parent | 3246c09fa5dd9c9354be8ec7d41fa5d5a57f0d0e (diff) | |
parent | eb74919884f14c0ceebb63d512768ea1c8823b84 (diff) | |
download | qtsvg-2856c5e52bdd2cb736d8394dd87a0726ea5fb560.tar.gz |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: Iaac1c139f074e4e82267654a2fbfdcf0a3f5e71c
Diffstat (limited to 'src/svg/qsvgwidget.h')
-rw-r--r-- | src/svg/qsvgwidget.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/svg/qsvgwidget.h b/src/svg/qsvgwidget.h index d936c6b..107c64d 100644 --- a/src/svg/qsvgwidget.h +++ b/src/svg/qsvgwidget.h @@ -65,12 +65,12 @@ public: QSvgRenderer *renderer() const; - QSize sizeHint() const; + QSize sizeHint() const override; public Q_SLOTS: void load(const QString &file); void load(const QByteArray &contents); protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; private: Q_DISABLE_COPY(QSvgWidget) Q_DECLARE_PRIVATE(QSvgWidget) |