diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-17 09:08:04 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-17 09:08:06 +0200 |
commit | 8842d9d1e6c0286922bf18357ca30c146d692316 (patch) | |
tree | 93b78c4f8dcb21275517f94da2ccc4500005e8c2 /src/gui/doc/snippets/textdocument-imagedrop/textedit.h | |
parent | 67352c92761fcb2e2c6a98b24e1bf5f33805cb3a (diff) | |
parent | 29778037f8a7b2c86bc4044409b37d5a51a15432 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I8bb8227f9da982e7d5ebe5324fc27abd9ac0d4fc
Diffstat (limited to 'src/gui/doc/snippets/textdocument-imagedrop/textedit.h')
-rw-r--r-- | src/gui/doc/snippets/textdocument-imagedrop/textedit.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/doc/snippets/textdocument-imagedrop/textedit.h b/src/gui/doc/snippets/textdocument-imagedrop/textedit.h index 9f73bceeaf..3f570884ba 100644 --- a/src/gui/doc/snippets/textdocument-imagedrop/textedit.h +++ b/src/gui/doc/snippets/textdocument-imagedrop/textedit.h @@ -59,8 +59,8 @@ class TextEdit : public QTextEdit public: TextEdit(QWidget *parent=0); - bool canInsertFromMimeData( const QMimeData *source ) const; - void insertFromMimeData( const QMimeData *source ); + bool canInsertFromMimeData( const QMimeData *source ) const override; + void insertFromMimeData( const QMimeData *source ) override; }; #endif |