diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/render/picking/pickeventfilter_p.h | |
parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/render/picking/pickeventfilter_p.h')
-rw-r--r-- | src/render/picking/pickeventfilter_p.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/render/picking/pickeventfilter_p.h b/src/render/picking/pickeventfilter_p.h index df94a3085..fc4b00ddc 100644 --- a/src/render/picking/pickeventfilter_p.h +++ b/src/render/picking/pickeventfilter_p.h @@ -53,6 +53,7 @@ #include <QObject> #include <QMouseEvent> +#include <QKeyEvent> #include <QtCore/qmutex.h> QT_BEGIN_NAMESPACE @@ -68,13 +69,15 @@ public: explicit PickEventFilter(QObject *parent = nullptr); ~PickEventFilter(); - QList<QMouseEvent> pendingEvents(); + QList<QMouseEvent> pendingMouseEvents(); + QList<QKeyEvent> pendingKeyEvents(); protected: bool eventFilter(QObject *obj, QEvent *e) Q_DECL_FINAL; private: - QList<QMouseEvent> m_pendingEvents; + QList<QMouseEvent> m_pendingMouseEvents; + QList<QKeyEvent> m_pendingKeyEvents; QMutex m_mutex; }; |