diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-27 11:22:57 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 13:33:14 +0200 |
| commit | 23c9d4c98f3c6729b56700edc1d7144b444b16db (patch) | |
| tree | 27b20ccbf3c101dbc7bcb1e509882b6c7fc75962 /src/corelib/kernel/qcoreevent.cpp | |
| parent | f69a5857d115786f44d053e68c36f74526020e82 (diff) | |
| parent | 0ef66e98ccf4946a0e4513ab5fc157df0f0aca4e (diff) | |
Merge branch '5.11' into dev
Conflicts:
qmake/library/qmakebuiltins.cpp
src/plugins/platforms/windows/qwindowstabletsupport.h
src/plugins/platforms/xcb/qxcbconnection.cpp
src/plugins/platforms/xcb/qxcbconnection.h
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/widgets/styles/qstylesheetstyle.cpp
tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
Done-With: Gatis Paeglis <gatis.paeglis@qt.io>
Change-Id: I000b0eb3cea2a5c7a99b95732bfdd41507cf916e
Diffstat (limited to 'src/corelib/kernel/qcoreevent.cpp')
| -rw-r--r-- | src/corelib/kernel/qcoreevent.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index e34fe3f955..cacbb1e495 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -204,6 +204,12 @@ QT_BEGIN_NAMESPACE \value Scroll The object needs to scroll to the supplied position (QScrollEvent). \value Shortcut Key press in child for shortcut key handling (QShortcutEvent). \value ShortcutOverride Key press in child, for overriding shortcut key handling (QKeyEvent). + When a shortcut is about to trigger, \c ShortcutOverride + is sent to the active window. This allows clients (e.g. widgets) + to signal that they will handle the shortcut themselves, by + accepting the event. If the shortcut override is accepted, the + event is delivered as a normal key press to the focus widget. + Otherwise, it triggers the shortcut action, if one exists. \value Show Widget was shown on screen (QShowEvent). \value ShowToParent A child widget has been shown. \value SockAct Socket activated, used to implement QSocketNotifier. |