diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-30 11:51:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-30 11:51:54 +0200 |
| commit | 69b6a9a19a37b990e43e0f9660b9ef687b5dafb3 (patch) | |
| tree | d2653d124f4d1f2eea594d7e53c682ef7a293628 /examples/serialport/terminal/settingsdialog.h | |
| parent | 5fbb69b1cad02d58d48e4753e6d246e68fcc6fab (diff) | |
| parent | 9df15226d3e7cbf8e601432d706c199f6ec3d112 (diff) | |
| download | qtserialport-69b6a9a19a37b990e43e0f9660b9ef687b5dafb3.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I576cf803037a823eb4dcbdf5eb0d209735871326
Diffstat (limited to 'examples/serialport/terminal/settingsdialog.h')
| -rw-r--r-- | examples/serialport/terminal/settingsdialog.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/serialport/terminal/settingsdialog.h b/examples/serialport/terminal/settingsdialog.h index da17565..ea249c1 100644 --- a/examples/serialport/terminal/settingsdialog.h +++ b/examples/serialport/terminal/settingsdialog.h @@ -87,7 +87,7 @@ public: bool localEchoEnabled; }; - explicit SettingsDialog(QWidget *parent = 0); + explicit SettingsDialog(QWidget *parent = nullptr); ~SettingsDialog(); Settings settings() const; |