diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-17 08:32:43 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-17 08:32:43 +0200 |
commit | d49d076431d7579ecb33147187fe07eb148112ba (patch) | |
tree | 668370fb9a2eec50000e371125136921ef4518ab /examples/widgets/graphicsview/elasticnodes/graphwidget.h | |
parent | b01e69684b9b36492cc43472edeb72058be9f706 (diff) | |
parent | 35cdcddd605d8823b7b57129e8d7279133a3ca89 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ic1fd51143f903b7e9086fc19ca960dfd9654ee00
Diffstat (limited to 'examples/widgets/graphicsview/elasticnodes/graphwidget.h')
-rw-r--r-- | examples/widgets/graphicsview/elasticnodes/graphwidget.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/widgets/graphicsview/elasticnodes/graphwidget.h b/examples/widgets/graphicsview/elasticnodes/graphwidget.h index 5ed6aed452..6d241fa9f1 100644 --- a/examples/widgets/graphicsview/elasticnodes/graphwidget.h +++ b/examples/widgets/graphicsview/elasticnodes/graphwidget.h @@ -61,7 +61,7 @@ class GraphWidget : public QGraphicsView Q_OBJECT public: - GraphWidget(QWidget *parent = 0); + GraphWidget(QWidget *parent = nullptr); void itemMoved(); @@ -81,7 +81,7 @@ protected: void scaleView(qreal scaleFactor); private: - int timerId; + int timerId = 0; Node *centerNode; }; //! [0] |