3 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/widgets/qkeysequenceedit.cpp b/src/widgets/widgets/qkeysequenceedit.cpp
index a38250c195..97ee915037 100644
--- a/src/widgets/widgets/qkeysequenceedit.cpp
+++ b/src/widgets/widgets/qkeysequenceedit.cpp
@@ -63,7 +63,7 @@ void QKeySequenceEditPrivate::init()
     layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(lineEdit);
 
-    key[0] = key[1] = key[2] = key[3] = 0;
+    std::fill_n(key, QKeySequencePrivate::MaxKeyCount, QKeyCombination::fromCombined(0));
 
     lineEdit->setFocusProxy(q);
     lineEdit->installEventFilter(q);
@@ -186,7 +186,7 @@ void QKeySequenceEdit::setKeySequence(const QKeySequence &keySequence)
 
     d->keySequence = keySequence;
 
-    d->key[0] = d->key[1] = d->key[2] = d->key[3] = 0;
+    d->key[0] = d->key[1] = d->key[2] = d->key[3] = QKeyCombination::fromCombined(0);
     d->keyNum = keySequence.count();
     for (int i = 0; i < d->keyNum; ++i)
         d->key[i] = keySequence[i];
@@ -286,7 +286,7 @@ void QKeySequenceEdit::keyPressEvent(QKeyEvent *e)
     }
 
 
-    d->key[d->keyNum] = nextKey;
+    d->key[d->keyNum] = QKeyCombination::fromCombined(nextKey);
     d->keyNum++;
 
     QKeySequence key(d->key[0], d->key[1], d->key[2], d->key[3]);
diff --git a/src/widgets/widgets/qkeysequenceedit_p.h b/src/widgets/widgets/qkeysequenceedit_p.h
index 7af034e735..8cd58de68f 100644
--- a/src/widgets/widgets/qkeysequenceedit_p.h
+++ b/src/widgets/widgets/qkeysequenceedit_p.h
@@ -76,7 +76,7 @@ public:
     QLineEdit *lineEdit;
     QKeySequence keySequence;
     int keyNum;
-    int key[QKeySequencePrivate::MaxKeyCount];
+    QKeyCombination key[QKeySequencePrivate::MaxKeyCount];
     int prevKey;
     int releaseTimer;
 };
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index c2ef383d28..9007d2af78 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -3406,7 +3406,7 @@ void QMenu::keyPressEvent(QKeyEvent *e)
                         continue;
                     QAction *act = d->actions.at(i);
                     QKeySequence sequence = QKeySequence::mnemonic(act->text());
-                    int key = sequence[0] & 0xffff;
+                    int key = sequence[0].toCombined() & 0xffff; // suspicious
                     if (key == c.unicode()) {
                         clashCount++;
                         if (!first)