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/corelib/doc/snippets/eventfilters/filterobject.h | |
| parent | 67352c92761fcb2e2c6a98b24e1bf5f33805cb3a (diff) | |
| parent | 29778037f8a7b2c86bc4044409b37d5a51a15432 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I8bb8227f9da982e7d5ebe5324fc27abd9ac0d4fc
Diffstat (limited to 'src/corelib/doc/snippets/eventfilters/filterobject.h')
| -rw-r--r-- | src/corelib/doc/snippets/eventfilters/filterobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/doc/snippets/eventfilters/filterobject.h b/src/corelib/doc/snippets/eventfilters/filterobject.h index 08b7c67192..354aa4ff5c 100644 --- a/src/corelib/doc/snippets/eventfilters/filterobject.h +++ b/src/corelib/doc/snippets/eventfilters/filterobject.h @@ -59,7 +59,7 @@ class FilterObject : public QObject public: FilterObject(QObject *parent = 0); - bool eventFilter(QObject *object, QEvent *event); + bool eventFilter(QObject *object, QEvent *event) override; void setFilteredObject(QObject *object); private: |