Merge branch '4.5'

Conflicts:
	tests/auto/qaction/tst_qaction.cpp

6 files changed, 37 insertions, 52 deletions

diff --git a/src/corelib/tools/qbytearraymatcher.cpp b/src/corelib/tools/qbytearraymatcher.cpp
index cd4cf90..211d190 100644
--- a/src/corelib/tools/qbytearraymatcher.cpp
+++ b/src/corelib/tools/qbytearraymatcher.cpp
@@ -120,6 +120,7 @@ QByteArrayMatcher::QByteArrayMatcher()
     : d(0)
 {
     p.p = 0;
+    p.l = 0;
     qMemSet(p.q_skiptable, 0, sizeof(p.q_skiptable));
 }
 
@@ -170,7 +171,7 @@ QByteArrayMatcher::~QByteArrayMatcher()
 QByteArrayMatcher &QByteArrayMatcher::operator=(const QByteArrayMatcher &other)
 {
     q_pattern = other.q_pattern;
-    qMemCopy(p.q_skiptable, other.p.q_skiptable, sizeof(p.q_skiptable));
+    qMemCopy(&p, &other.p, sizeof(p));
     return *this;
 }
 
diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h
index d7f2366..633e92c 100644
--- a/src/corelib/tools/qbytearraymatcher.h
+++ b/src/corelib/tools/qbytearraymatcher.h
@@ -67,7 +67,12 @@ public:
 
     int indexIn(const QByteArray &ba, int from = 0) const;
     int indexIn(const char *str, int len, int from = 0) const;
-    inline QByteArray pattern() const { return q_pattern; }
+    inline QByteArray pattern() const
+    {
+        if (q_pattern.isNull())
+            return QByteArray((const char*)p.p, p.l);
+        return q_pattern;
+    }
 
 private:
     QByteArrayMatcherPrivate *d;
diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp
index 921be22..c6addc1 100644
--- a/src/gui/kernel/qaction.cpp
+++ b/src/gui/kernel/qaction.cpp
@@ -136,27 +136,25 @@ void QActionPrivate::redoGrab(QShortcutMap &map)
 void QActionPrivate::redoGrabAlternate(QShortcutMap &map)
 {
     Q_Q(QAction);
-    for (int i = 0; i < alternateShortcutIds.size(); ++i)
-        if (int id = alternateShortcutIds.at(i))
+    foreach (int id, alternateShortcutIds)
+        if (id)
             map.removeShortcut(id, q);
     alternateShortcutIds.clear();
     if (alternateShortcuts.isEmpty())
         return;
-    for (int i = 0; i < alternateShortcuts.size(); ++i) {
-        const QKeySequence &alternate = alternateShortcuts.at(i);
+    foreach (const QKeySequence& alternate, alternateShortcuts) {
         if (!alternate.isEmpty())
             alternateShortcutIds.append(map.addShortcut(q, alternate, shortcutContext));
         else
             alternateShortcutIds.append(0);
     }
-
     if (!enabled) {
-        for (int i = 0; i < alternateShortcutIds.size(); ++i)
-            map.setShortcutEnabled(false, alternateShortcutIds.at(i), q);
+        foreach (int id, alternateShortcutIds)
+            map.setShortcutEnabled(false, id, q);
     }
     if (!autorepeat) {
-        for (int i = 0; i < alternateShortcutIds.size(); ++i)
-            map.setShortcutAutoRepeat(false, alternateShortcutIds.at(i), q);
+        foreach (int id, alternateShortcutIds)
+            map.setShortcutAutoRepeat(false, id, q);
     }
 }
 
@@ -165,26 +163,10 @@ void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map)
     Q_Q(QAction);
     if (shortcutId)
         map.setShortcutEnabled(enable, shortcutId, q);
-    for (int i = 0; i < alternateShortcutIds.size(); ++i)
-        if (int id = alternateShortcutIds.at(i))
+    foreach (int id, alternateShortcutIds)
+        if (id)
             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
 
 
@@ -633,8 +615,8 @@ QAction::~QAction()
 #ifndef QT_NO_SHORTCUT
     if (d->shortcutId && qApp) {
         qApp->d_func()->shortcutMap.removeShortcut(d->shortcutId, this);
-        for (int i = 0; i < d->alternateShortcutIds.size(); ++i)
-            qApp->d_func()->shortcutMap.removeShortcut(d->alternateShortcutIds.at(i), this);
+        foreach (int id, d->alternateShortcutIds)
+            qApp->d_func()->shortcutMap.removeShortcut(id, this);
     }
 #endif
 }
@@ -1067,12 +1049,7 @@ void QAction::setVisible(bool b)
     d->visible = b;
     d->enabled = b && !d->forceDisabled && (!d->group || d->group->isEnabled()) ;
 #ifndef QT_NO_SHORTCUT
-    if (b) {
-        d->redoGrab(qApp->d_func()->shortcutMap);
-        d->redoGrabAlternate(qApp->d_func()->shortcutMap);
-    } else {
-        d->removeAll(qApp->d_func()->shortcutMap);
-    }
+    d->setShortcutEnabled(d->enabled, qApp->d_func()->shortcutMap);
 #endif
     d->sendDataChanged();
 }
diff --git a/src/gui/kernel/qaction_p.h b/src/gui/kernel/qaction_p.h
index a5b3731..0617ef5 100644
--- a/src/gui/kernel/qaction_p.h
+++ b/src/gui/kernel/qaction_p.h
@@ -111,7 +111,6 @@ 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 f3c93c6..50b6e59 100644
--- a/src/gui/kernel/qshortcut.cpp
+++ b/src/gui/kernel/qshortcut.cpp
@@ -385,21 +385,19 @@ bool QShortcut::event(QEvent *e)
 {
     Q_D(QShortcut);
     bool handled = false;
-    if (e->type() == QEvent::Shortcut) {
+    if (d->sc_enabled && 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 415d71e..ed9654b 100644
--- a/src/gui/kernel/qshortcutmap.cpp
+++ b/src/gui/kernel/qshortcutmap.cpp
@@ -359,6 +359,8 @@ bool QShortcutMap::tryShortcutEvent(QObject *o, QKeyEvent *e)
     else
         e->ignore();
 
+    int identicalMatches = d->identicals.count();
+
     switch(result) {
     case QKeySequence::NoMatch:
         return stateWasAccepted;
@@ -368,8 +370,9 @@ bool QShortcutMap::tryShortcutEvent(QObject *o, QKeyEvent *e)
     default:
 	break;
     }
-
-    return true;
+    // If nextState is QKeySequence::ExactMatch && identicals.count == 0
+    // we've only found disabled shortcuts
+    return identicalMatches > 0 || result == QKeySequence::PartialMatch;
 }
 
 /*! \internal
@@ -491,7 +494,9 @@ QKeySequence::SequenceMatch QShortcutMap::find(QKeyEvent *e)
                     // We don't need partials, if we have identicals
                     if (d->identicals.size())
                         break;
-                    partialFound = true;
+                    // We only care about enabled partials, so we don't consume
+                    // key events when all partials are disabled!
+                    partialFound |= (*it).enabled;
                 }
             }
             ++it;