diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-09 09:21:48 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-09 09:21:48 +0200 |
| commit | 2eead078c86a4d24403d3d1ba737dbc3096a8b42 (patch) | |
| tree | 58b8da96c63fe4c1e59d3707f0b633592210a82d /examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.h | |
| parent | 94902905ec203626abc050744d14898674dc2bbd (diff) | |
| parent | 89d0a03c067b42155b1a2d310f8514f595abfd61 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: If8e9d88771243fd9e221b49f53d7d8b111a8ce2a
Diffstat (limited to 'examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.h')
| -rw-r--r-- | examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.h b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.h index 29daaa58c1..c2d87a5660 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.h +++ b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialog.h @@ -64,7 +64,7 @@ class EmbeddedDialog : public QDialog Q_OBJECT public: - EmbeddedDialog(QWidget *parent = 0); + EmbeddedDialog(QWidget *parent = nullptr); ~EmbeddedDialog(); private slots: |