diff options
author | Olivier Goffart <ogoffart@trolltech.com> | 2009-05-13 08:26:31 (GMT) |
---|---|---|
committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-05-13 08:26:31 (GMT) |
commit | f9afc51f96b2b09d8be7fcd9bf080d1144643273 (patch) | |
tree | 9cfaefbd6f58d3bb47ab3be564bd74df0ff65ccb /src/gui/kernel | |
parent | 5cbaaa1a8baf14b66efe89fe967a3e966dac659c (diff) | |
parent | 03415f5db33ee1d8af15b924f84b547a9ed8020b (diff) | |
download | Qt-f9afc51f96b2b09d8be7fcd9bf080d1144643273.zip Qt-f9afc51f96b2b09d8be7fcd9bf080d1144643273.tar.gz Qt-f9afc51f96b2b09d8be7fcd9bf080d1144643273.tar.bz2 |
Merge commit 'origin/4.5'
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qevent.cpp | 13 | ||||
-rw-r--r-- | src/gui/kernel/qshortcutmap.cpp | 1 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index a4d5035..0ab4423 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -675,12 +675,13 @@ QWheelEvent::QWheelEvent(const QPoint &pos, const QPoint& globalPos, int delta, The \a type parameter must be QEvent::KeyPress, QEvent::KeyRelease, or QEvent::ShortcutOverride. - If \a key is 0, the event is not a result of - a known key; for example, it may be the result of a compose - sequence or keyboard macro. The \a modifiers holds the keyboard - modifiers, and the given \a text is the Unicode text that the - key generated. If \a autorep is true, isAutoRepeat() will be - true. \a count is the number of keys involved in the event. + Int \a key is the code for the Qt::Key that the event loop should listen + for. If \a key is 0, the event is not a result of a known key; for + example, it may be the result of a compose sequence or keyboard macro. + The \a modifiers holds the keyboard modifiers, and the given \a text + is the Unicode text that the key generated. If \a autorep is true, + isAutoRepeat() will be true. \a count is the number of keys involved + in the event. */ QKeyEvent::QKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers, const QString& text, bool autorep, ushort count) diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp index b6703e2..f998bb2 100644 --- a/src/gui/kernel/qshortcutmap.cpp +++ b/src/gui/kernel/qshortcutmap.cpp @@ -751,6 +751,7 @@ bool QShortcutMap::correctGraphicsWidgetContext(Qt::ShortcutContext context, QGr tw = tw->parentWidget(); return tw == w; } + return false; } // Below is Qt::WindowShortcut context |