diff framework/MainWindowBase.cpp @ 400:5fd0dd4ed984 beta

Merge from the default branch

--- 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()));