diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-11-13 07:20:23 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-11-13 07:21:33 +0100 |
| commit | d140f2f61499f424983582770af8c28399a373c1 (patch) | |
| tree | b05dc03863502293083ded9d61fc344ab5a9da7b /examples/widgets | |
| parent | bf131e8d2181b3404f5293546ed390999f760404 (diff) | |
| parent | 8ffb200153d1b1a8402c875c4961160efb149201 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
examples/widgets/widgets/scribble/mainwindow.cpp
This amends cb54c16584cf3be746a1a536c1e37cb3022a2f1b.
Change-Id: Iaae60a893330524b2973917e23b31f9d51f8bd38
Diffstat (limited to 'examples/widgets')
| -rw-r--r-- | examples/widgets/widgets/scribble/mainwindow.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/widgets/widgets/scribble/mainwindow.cpp b/examples/widgets/widgets/scribble/mainwindow.cpp index db4f8d3637..c9a34796ac 100644 --- a/examples/widgets/widgets/scribble/mainwindow.cpp +++ b/examples/widgets/widgets/scribble/mainwindow.cpp @@ -58,6 +58,7 @@ #include <QInputDialog> #include <QMenuBar> #include <QMessageBox> +#include <QCloseEvent> //! [0] MainWindow::MainWindow(QWidget *parent) |