diff options
| author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2015-09-22 11:34:33 +0300 |
|---|---|---|
| committer | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2015-11-30 16:14:15 +0300 |
| commit | ecdaf840c1ea6a3040d59028a8bac9ee15dec20f (patch) | |
| tree | 42d2184fbd198596b9fb129feb2d37b039eeb40f /qt | |
| parent | 5e9219293d0cfbef800f37a1b740b618cf5a61c2 (diff) | |
Rebase fixes
Diffstat (limited to 'qt')
| -rw-r--r-- | qt/draw_widget.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qt/draw_widget.hpp b/qt/draw_widget.hpp index 3036c7d395..e71d3af89b 100644 --- a/qt/draw_widget.hpp +++ b/qt/draw_widget.hpp @@ -75,7 +75,7 @@ namespace qt void resizeGL(int width, int height) override; void paintGL() override; - void exposeEvent(QExposeEvent * event); + void exposeEvent(QExposeEvent * event) override; void mousePressEvent(QMouseEvent * e) override; void mouseDoubleClickEvent(QMouseEvent * e) override; void mouseMoveEvent(QMouseEvent * e) override; @@ -83,7 +83,7 @@ namespace qt void wheelEvent(QWheelEvent * e) override; void keyPressEvent(QKeyEvent * e) override; void keyReleaseEvent(QKeyEvent * e) override; - //@} + //@}a private: enum RenderingState |