diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-13 01:00:43 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-13 01:00:43 +0200 |
| commit | 8d8140dffa9aa680a519b501fc5bdf08c91dd735 (patch) | |
| tree | 346d255ca98fd79aaef9db84eac724a49285da1c /examples/widgets/touch/pinchzoom/graphicsview.h | |
| parent | e55a79b022e542a482177c2f34140c23b100b708 (diff) | |
| parent | a90899df4330afccd8299fa81754f369e6d12344 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I9953c1ca16862184c2373027e946c482ce8e6f0e
Diffstat (limited to 'examples/widgets/touch/pinchzoom/graphicsview.h')
| -rw-r--r-- | examples/widgets/touch/pinchzoom/graphicsview.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/widgets/touch/pinchzoom/graphicsview.h b/examples/widgets/touch/pinchzoom/graphicsview.h index d4e2e32d36..c0faeba444 100644 --- a/examples/widgets/touch/pinchzoom/graphicsview.h +++ b/examples/widgets/touch/pinchzoom/graphicsview.h @@ -56,10 +56,10 @@ class GraphicsView : public QGraphicsView Q_OBJECT public: - GraphicsView(QGraphicsScene *scene = 0, QWidget *parent = 0); + GraphicsView(QGraphicsScene *scene = nullptr, QWidget *parent = nullptr); bool viewportEvent(QEvent *event) override; private: - qreal totalScaleFactor; + qreal totalScaleFactor = 1; }; |