diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:48:59 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:48:59 +0100 |
| commit | 2856c5e52bdd2cb736d8394dd87a0726ea5fb560 (patch) | |
| tree | a71e216d3ef7abd75647146284c91199c256bf13 /examples/svg/draganddrop/delayedencoding/mimedata.h | |
| parent | 3246c09fa5dd9c9354be8ec7d41fa5d5a57f0d0e (diff) | |
| parent | eb74919884f14c0ceebb63d512768ea1c8823b84 (diff) | |
| download | qtsvg-2856c5e52bdd2cb736d8394dd87a0726ea5fb560.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: Iaac1c139f074e4e82267654a2fbfdcf0a3f5e71c
Diffstat (limited to 'examples/svg/draganddrop/delayedencoding/mimedata.h')
| -rw-r--r-- | examples/svg/draganddrop/delayedencoding/mimedata.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/svg/draganddrop/delayedencoding/mimedata.h b/examples/svg/draganddrop/delayedencoding/mimedata.h index 9588ae8..70bc551 100644 --- a/examples/svg/draganddrop/delayedencoding/mimedata.h +++ b/examples/svg/draganddrop/delayedencoding/mimedata.h @@ -50,13 +50,13 @@ class MimeData : public QMimeData public: MimeData(); - QStringList formats() const; + QStringList formats() const override; signals: void dataRequested(const QString &mimeType) const; protected: - QVariant retrieveData(const QString &mimetype, QVariant::Type type) const; + QVariant retrieveData(const QString &mimetype, QVariant::Type type) const override; }; //![0] |