4 files changed, 50 insertions, 27 deletions

diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp
index abb17d7..4edc1ca 100644
--- a/src/gui/kernel/qaction.cpp
+++ b/src/gui/kernel/qaction.cpp
@@ -136,25 +136,27 @@ void QActionPrivate::redoGrab(QShortcutMap &map)
 void QActionPrivate::redoGrabAlternate(QShortcutMap &map)
 {
     Q_Q(QAction);
-    foreach (int id, alternateShortcutIds)
-        if (id)
+    for (int i = 0; i < alternateShortcutIds.size(); ++i)
+        if (int id = alternateShortcutIds.at(i))
             map.removeShortcut(id, q);
     alternateShortcutIds.clear();
     if (alternateShortcuts.isEmpty())
         return;
-    foreach (const QKeySequence& alternate, alternateShortcuts) {
+    for (int i = 0; i < alternateShortcuts.size(); ++i) {
+        const QKeySequence &alternate = alternateShortcuts.at(i);
         if (!alternate.isEmpty())
             alternateShortcutIds.append(map.addShortcut(q, alternate, shortcutContext));
         else
             alternateShortcutIds.append(0);
     }
+
     if (!enabled) {
-        foreach (int id, alternateShortcutIds)
-            map.setShortcutEnabled(false, id, q);
+        for (int i = 0; i < alternateShortcutIds.size(); ++i)
+            map.setShortcutEnabled(false, alternateShortcutIds.at(i), q);
     }
     if (!autorepeat) {
-        foreach (int id, alternateShortcutIds)
-            map.setShortcutAutoRepeat(false, id, q);
+        for (int i = 0; i < alternateShortcutIds.size(); ++i)
+            map.setShortcutAutoRepeat(false, alternateShortcutIds.at(i), q);
     }
 }
 
@@ -163,10 +165,26 @@ void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map)
     Q_Q(QAction);
     if (shortcutId)
         map.setShortcutEnabled(enable, shortcutId, q);
-    foreach (int id, alternateShortcutIds)
-        if (id)
+    for (int i = 0; i < alternateShortcutIds.size(); ++i)
+        if (int id = alternateShortcutIds.at(i))
             map.setShortcutEnabled(enable, id, q);
 }
+
+void QActionPrivate::removeAll(QShortcutMap &map)
+{
+    Q_Q(QAction);
+    if (shortcutId) {
+        map.removeShortcut(shortcutId, q);
+        shortcutId = 0;
+    }
+
+    for (int i = 0; i < alternateShortcutIds.size(); ++i)
+        if (int id = alternateShortcutIds.at(i))
+            map.removeShortcut(id, q);
+
+    alternateShortcutIds.clear();
+}
+
 #endif // QT_NO_SHORTCUT
 
 
@@ -615,8 +633,8 @@ QAction::~QAction()
 #ifndef QT_NO_SHORTCUT
     if (d->shortcutId && qApp) {
         qApp->d_func()->shortcutMap.removeShortcut(d->shortcutId, this);
-        foreach (int id, d->alternateShortcutIds)
-            qApp->d_func()->shortcutMap.removeShortcut(id, this);
+        for (int i = 0; i < d->alternateShortcutIds.size(); ++i)
+            qApp->d_func()->shortcutMap.removeShortcut(d->alternateShortcutIds.at(i), this);
     }
 #endif
 }
@@ -1049,7 +1067,12 @@ void QAction::setVisible(bool b)
     d->visible = b;
     d->enabled = b && !d->forceDisabled && (!d->group || d->group->isEnabled()) ;
 #ifndef QT_NO_SHORTCUT
-    d->setShortcutEnabled(d->enabled, qApp->d_func()->shortcutMap);
+    if (b) {
+        d->redoGrab(qApp->d_func()->shortcutMap);
+        d->redoGrabAlternate(qApp->d_func()->shortcutMap);
+    } else {
+        d->removeAll(qApp->d_func()->shortcutMap);
+    }
 #endif
     d->sendDataChanged();
 }
diff --git a/src/gui/kernel/qaction_p.h b/src/gui/kernel/qaction_p.h
index 0617ef5..a5b3731 100644
--- a/src/gui/kernel/qaction_p.h
+++ b/src/gui/kernel/qaction_p.h
@@ -111,6 +111,7 @@ public:
     void redoGrab(QShortcutMap &map);
     void redoGrabAlternate(QShortcutMap &map);
     void setShortcutEnabled(bool enable, QShortcutMap &map);
+    void removeAll(QShortcutMap &map);
 
     static QShortcutMap *globalMap;
 #endif // QT_NO_SHORTCUT
diff --git a/src/gui/kernel/qshortcut.cpp b/src/gui/kernel/qshortcut.cpp
index 50b6e59..f3c93c6 100644
--- a/src/gui/kernel/qshortcut.cpp
+++ b/src/gui/kernel/qshortcut.cpp
@@ -385,19 +385,21 @@ bool QShortcut::event(QEvent *e)
 {
     Q_D(QShortcut);
     bool handled = false;
-    if (d->sc_enabled && e->type() == QEvent::Shortcut) {
+    if (e->type() == QEvent::Shortcut) {
         QShortcutEvent *se = static_cast<QShortcutEvent *>(e);
         if (se->shortcutId() == d->sc_id && se->key() == d->sc_sequence){
+            if (d->sc_enabled) {
 #ifndef QT_NO_WHATSTHIS
-            if (QWhatsThis::inWhatsThisMode()) {
-                QWhatsThis::showText(QCursor::pos(), d->sc_whatsthis);
-                handled = true;
-            } else
+                if (QWhatsThis::inWhatsThisMode()) {
+                    QWhatsThis::showText(QCursor::pos(), d->sc_whatsthis);
+                    handled = true;
+                } else
 #endif
-            if (se->isAmbiguous())
-                emit activatedAmbiguously();
-            else
-                emit activated();
+                if (se->isAmbiguous())
+                    emit activatedAmbiguously();
+                else
+                    emit activated();
+            }
             handled = true;
         }
     }
diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp
index ed9654b..9766a69 100644
--- a/src/gui/kernel/qshortcutmap.cpp
+++ b/src/gui/kernel/qshortcutmap.cpp
@@ -370,9 +370,8 @@ bool QShortcutMap::tryShortcutEvent(QObject *o, QKeyEvent *e)
     default:
 	break;
     }
-    // If nextState is QKeySequence::ExactMatch && identicals.count == 0
-    // we've only found disabled shortcuts
-    return identicalMatches > 0 || result == QKeySequence::PartialMatch;
+
+    return true;
 }
 
 /*! \internal
@@ -494,9 +493,7 @@ QKeySequence::SequenceMatch QShortcutMap::find(QKeyEvent *e)
                     // We don't need partials, if we have identicals
                     if (d->identicals.size())
                         break;
-                    // We only care about enabled partials, so we don't consume
-                    // key events when all partials are disabled!
-                    partialFound |= (*it).enabled;
+                    partialFound = true;
                 }
             }
             ++it;