diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-18 03:02:10 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-18 03:02:10 +0100 |
| commit | 60be66f17939ccbc6fcc73a16de45af6822851b8 (patch) | |
| tree | daae9ecc1f7e3a0ebc6b76e6baa27fd37d3e67ff /examples | |
| parent | 4092c74db6043d70caca36050c356cc5f2d46c86 (diff) | |
| parent | fab885ac1b5e5d3c130c033e4a1234e985179486 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Iddb27e0884cb095f46fd668a2b8d64dc6dd4f58d
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/assistant/remotecontrol/remotecontrol.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/assistant/remotecontrol/remotecontrol.h b/examples/assistant/remotecontrol/remotecontrol.h index 40e370f71..f59ffb7aa 100644 --- a/examples/assistant/remotecontrol/remotecontrol.h +++ b/examples/assistant/remotecontrol/remotecontrol.h @@ -64,7 +64,7 @@ class RemoteControl : public QMainWindow Q_OBJECT public: - RemoteControl(QWidget *parent = nullptr, Qt::WindowFlags flags = 0); + RemoteControl(QWidget *parent = nullptr, Qt::WindowFlags flags = {}); ~RemoteControl(); private: |