diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
| commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
| tree | 3d53dacf6430f9099e1fb20835881205de674961 /examples/opengl/hellowindow/hellowindow.h | |
| parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
| parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) | |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'examples/opengl/hellowindow/hellowindow.h')
| -rw-r--r-- | examples/opengl/hellowindow/hellowindow.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/examples/opengl/hellowindow/hellowindow.h b/examples/opengl/hellowindow/hellowindow.h index e92e45a125..e6d7970cfc 100644 --- a/examples/opengl/hellowindow/hellowindow.h +++ b/examples/opengl/hellowindow/hellowindow.h @@ -112,11 +112,12 @@ public: QColor color() const; void updateColor(); +protected: + bool event(QEvent *ev) override; void exposeEvent(QExposeEvent *event) override; - -private: void mousePressEvent(QMouseEvent *) override; +private: int m_colorIndex; QColor m_color; const QSharedPointer<Renderer> m_renderer; |