diff options
| author | Määttä Antti <antti.maatta@theqtcompany.com> | 2016-06-07 11:54:15 +0300 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2016-06-08 08:06:06 +0000 |
| commit | 3881ed8c19381d8199db842803fb4872ba74dfb9 (patch) | |
| tree | 30daa274a1d7d7ca3f7696ebde66e7fd8be31e5a /src/input/frontend/qinputsettings.h | |
| parent | c4999c878bfa6ca3cd1c5dda8afc989cbc265641 (diff) | |
Fix reset in input event filters in shutdown
The event filters can cause reset if they remain registered while the
scene is being shutdown. If the filters are not unregisteded, they
will continue receiving events when the shutdown deallocates them.
Unregister filters when the scene is being shutdown, except the
eventSource filters, since the eventSource might be already deallocated
by that point. Add connection to eventSource destroyed signal to prevent
this.
Task-number: QTBUG-53834
Change-Id: I1dd1875b98021592580dd59a178ad18308c7d67c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/input/frontend/qinputsettings.h')
| -rw-r--r-- | src/input/frontend/qinputsettings.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/input/frontend/qinputsettings.h b/src/input/frontend/qinputsettings.h index 8eb3b6bf2..2fb3651c3 100644 --- a/src/input/frontend/qinputsettings.h +++ b/src/input/frontend/qinputsettings.h @@ -68,6 +68,9 @@ Q_SIGNALS: private: Q_DECLARE_PRIVATE(QInputSettings) Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE; + void eventSourceDestroyed(); + + QMetaObject::Connection m_connection; }; } // Qt3DInput |