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/embedded/fluidlauncher/slideshow.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/embedded/fluidlauncher/slideshow.h')
-rw-r--r-- | examples/svg/embedded/fluidlauncher/slideshow.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/examples/svg/embedded/fluidlauncher/slideshow.h b/examples/svg/embedded/fluidlauncher/slideshow.h index db37e82..d5847e0 100644 --- a/examples/svg/embedded/fluidlauncher/slideshow.h +++ b/examples/svg/embedded/fluidlauncher/slideshow.h @@ -78,13 +78,13 @@ signals: void inputReceived(); protected: - void paintEvent(QPaintEvent *event); - void keyPressEvent(QKeyEvent* event); - void mouseMoveEvent(QMouseEvent* event); - void mousePressEvent(QMouseEvent* event); - void mouseReleaseEvent(QMouseEvent* event); - void timerEvent(QTimerEvent* event); - void showEvent(QShowEvent * event ); + void paintEvent(QPaintEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void timerEvent(QTimerEvent *event) override; + void showEvent(QShowEvent *event ) override; private: |