diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-29 12:31:41 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-29 12:31:41 +0100 |
commit | 947cace7993807d173656300f4440ae5166624fe (patch) | |
tree | 39eb81b1bda6a92a3358b1c489e9cfce6d241f17 /examples/widgets/animation/stickman/graphicsview.h | |
parent | 5e921a18b2a098f68dbce368f9d20447939b3510 (diff) | |
parent | 7eb4be9db89d40ea2cc090e7a562bdd588708607 (diff) |
Merge 5.8 into 5.8.0
Change-Id: If74f0ade36baa9454ebcffb8d6bdd14ac963c1cb
Diffstat (limited to 'examples/widgets/animation/stickman/graphicsview.h')
-rw-r--r-- | examples/widgets/animation/stickman/graphicsview.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/widgets/animation/stickman/graphicsview.h b/examples/widgets/animation/stickman/graphicsview.h index 4b9b8fc028..56396bb780 100644 --- a/examples/widgets/animation/stickman/graphicsview.h +++ b/examples/widgets/animation/stickman/graphicsview.h @@ -61,7 +61,7 @@ public: GraphicsView(QWidget *parent = 0); protected: - virtual void resizeEvent(QResizeEvent *event) override; + void resizeEvent(QResizeEvent *event) override; void keyPressEvent(QKeyEvent *) override; signals: |