summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xcb/qxcbkeyboard.h
diff options
context:
space:
mode:
authorGatis Paeglis <gatis.paeglis@digia.com>2013-04-16 19:55:54 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-07 22:43:14 +0200
commit260bfaf056c08330ec2ed292e8d9def550e662ec (patch)
tree8a35335832e82a8461f82c0785f3352976c55ff9 /src/plugins/platforms/xcb/qxcbkeyboard.h
parent05351b0cde3e80d2d0ae3a838e802ff6086e4b59 (diff)
Added possibleKeys(QKeyEvent *) to QXcbIntegration
This is required for a modifier+key shortcut support. Also fixes old Qt bug when keymap group changes were not handled properly for shortcut functionality. Task-number: QTBUG-26902 Task-number: QTBUG-4845 Change-Id: I04d2c2ad7049df7420999816154605848fa670e1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbkeyboard.h')
-rw-r--r--src/plugins/platforms/xcb/qxcbkeyboard.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.h b/src/plugins/platforms/xcb/qxcbkeyboard.h
index ff774197d2..9c278eeb8c 100644
--- a/src/plugins/platforms/xcb/qxcbkeyboard.h
+++ b/src/plugins/platforms/xcb/qxcbkeyboard.h
@@ -65,6 +65,7 @@ public:
void handleMappingNotifyEvent(const xcb_xkb_map_notify_event_t *event);
Qt::KeyboardModifiers translateModifiers(int s) const;
+ QList<int> possibleKeys(const QKeyEvent *e) const;
void updateKeymap();
void updateXKBState(xcb_xkb_state_notify_event_t *state);