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 /examples/svg/embeddedsvgviewer/embeddedsvgviewer.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 'examples/svg/embeddedsvgviewer/embeddedsvgviewer.h')
-rw-r--r-- | examples/svg/embeddedsvgviewer/embeddedsvgviewer.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.h b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.h index 9b2b741..3a7daec 100644 --- a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.h +++ b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.h @@ -64,10 +64,10 @@ class EmbeddedSvgViewer : public QWidget Q_OBJECT public: EmbeddedSvgViewer(const QString& filePath); - virtual void paintEvent(QPaintEvent *event); - void mouseMoveEvent ( QMouseEvent * event ); - void mousePressEvent ( QMouseEvent * event ); - void resizeEvent ( QResizeEvent * event ); + void paintEvent(QPaintEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void resizeEvent(QResizeEvent *event) override; public slots: void setZoom(int); // 100 <= newZoom < 0 |