diff options
author | Liang Qi <liang.qi@qt.io> | 2017-09-21 06:55:09 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-09-21 06:55:09 +0000 |
commit | e5114e10dcb1fc535b4a33a3008448baf4ec7cbf (patch) | |
tree | 7ec9eaac618a4de514f452b0e7aff58510ce7c62 /examples/sql/masterdetail/mainwindow.h | |
parent | 34aa7a18af5d355380c662bb1a10b3f0d7b7ed3e (diff) | |
parent | 01bc69f99f189b03d0b9cad77cc300798937cad1 (diff) |
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
Diffstat (limited to 'examples/sql/masterdetail/mainwindow.h')
-rw-r--r-- | examples/sql/masterdetail/mainwindow.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/sql/masterdetail/mainwindow.h b/examples/sql/masterdetail/mainwindow.h index be3c6c94f4..dc6d8d1613 100644 --- a/examples/sql/masterdetail/mainwindow.h +++ b/examples/sql/masterdetail/mainwindow.h @@ -71,7 +71,7 @@ class MainWindow : public QMainWindow public: MainWindow(const QString &artistTable, const QString &albumTable, - QFile *albumDetails, QWidget *parent = 0); + QFile *albumDetails, QWidget *parent = nullptr); private slots: void about(); |