diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-06 23:27:32 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-06 23:31:16 +0200 |
| commit | 9a9a9bd1144663e2cb74efdd3d3f6d76c72313f9 (patch) | |
| tree | 2811ccf99d641b040587716f17be8c59a30e11fe /src/quicktemplates2/qquickpopup_p.h | |
| parent | 320647bce7d968b5798dfc6946df555a548e3f8f (diff) | |
| parent | 86180aed5008779b1b94731d9b4c6b1fdac8f3d3 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: If097242bfffe435d3b379a73eb6c8f54bed8495b
Diffstat (limited to 'src/quicktemplates2/qquickpopup_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickpopup_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickpopup_p.h b/src/quicktemplates2/qquickpopup_p.h index 1f2cabcf..5f5fd6bd 100644 --- a/src/quicktemplates2/qquickpopup_p.h +++ b/src/quicktemplates2/qquickpopup_p.h @@ -344,7 +344,6 @@ protected: void componentComplete() override; bool isComponentComplete() const; - bool eventFilter(QObject *object, QEvent *event) override; virtual bool childMouseEventFilter(QQuickItem *child, QEvent *event); virtual void focusInEvent(QFocusEvent *event); virtual void focusOutEvent(QFocusEvent *event); |