diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-29 01:00:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-29 01:00:10 +0200 |
| commit | 0e1866017fd389629629b150ce252820592506cd (patch) | |
| tree | 681142ae0e610ef7af2a43ca2d62c3ea5ed5f91a /src/plugins/platforms/winrt/qwinrtdrag.h | |
| parent | 9567a34bc0d9be87d3b0d6cbcb841837ca1d5659 (diff) | |
| parent | 9a8175a13124e156948914854d2fda7436065b08 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I6083c3e61b7dbe188f83676f7e7bb268e5ccf2f3
Diffstat (limited to 'src/plugins/platforms/winrt/qwinrtdrag.h')
| -rw-r--r-- | src/plugins/platforms/winrt/qwinrtdrag.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/winrt/qwinrtdrag.h b/src/plugins/platforms/winrt/qwinrtdrag.h index 3868c9f015..ab57999bba 100644 --- a/src/plugins/platforms/winrt/qwinrtdrag.h +++ b/src/plugins/platforms/winrt/qwinrtdrag.h @@ -77,7 +77,7 @@ class QWinRTInternalMimeData; class QWinRTInternalMimeData : public QInternalMimeData { public: QWinRTInternalMimeData(); - virtual ~QWinRTInternalMimeData(); + ~QWinRTInternalMimeData() override = default; bool hasFormat_sys(const QString &mimetype) const override; QStringList formats_sys() const override; @@ -92,7 +92,7 @@ private: class QWinRTDrag : public QPlatformDrag { public: QWinRTDrag(); - virtual ~QWinRTDrag(); + ~QWinRTDrag() override; static QWinRTDrag *instance(); Qt::DropAction drag(QDrag *) override; |