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/diagramscene/diagramscene.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/diagramscene/diagramscene.h')
| -rw-r--r-- | examples/widgets/graphicsview/diagramscene/diagramscene.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/widgets/graphicsview/diagramscene/diagramscene.h b/examples/widgets/graphicsview/diagramscene/diagramscene.h index 15063d58b7..5682468ef6 100644 --- a/examples/widgets/graphicsview/diagramscene/diagramscene.h +++ b/examples/widgets/graphicsview/diagramscene/diagramscene.h @@ -74,7 +74,7 @@ class DiagramScene : public QGraphicsScene public: enum Mode { InsertItem, InsertLine, InsertText, MoveItem }; - explicit DiagramScene(QMenu *itemMenu, QObject *parent = 0); + explicit DiagramScene(QMenu *itemMenu, QObject *parent = nullptr); QFont font() const { return myFont; } QColor textColor() const { return myTextColor; } QColor itemColor() const { return myItemColor; } |