Mercurial > hg > svapp

changeset 400:5fd0dd4ed984 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from the default branch
author Chris Cannam
date Mon, 01 Sep 2014 13:41:03 +0100
parents 7373a8c262ca (current diff) 81e41a430b58 (diff)
children
files
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/framework/MainWindowBase.cpp	Wed Aug 13 21:37:25 2014 +0100
+++ b/framework/MainWindowBase.cpp	Mon Sep 01 13:41:03 2014 +0100
@@ -368,7 +368,14 @@
             }
             if (hasButton) continue;
             QKeySequence sc = a->shortcut();
-            if (sc.count() == 1 && !(sc[0] & Qt::KeyboardModifierMask)) {
+
+            // Note that the set of "single-key shortcuts" that aren't
+            // working and that we need to handle here includes those
+            // with the Shift modifier mask as well as those with no
+            // modifier at all
+            if (sc.count() == 1 &&
+                ((sc[0] & Qt::KeyboardModifierMask) == Qt::NoModifier ||
+                 (sc[0] & Qt::KeyboardModifierMask) == Qt::ShiftModifier)) {
                 QShortcut *newSc = new QShortcut(sc, a->parentWidget());
                 QObject::connect(newSc, SIGNAL(activated()),
                                  m_menuShortcutMapper, SLOT(map()));