1 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/platform/unix/dbusmenu/qdbusmenutypes.cpp b/src/gui/platform/unix/dbusmenu/qdbusmenutypes.cpp
index f70ce67d4e..b7fd035883 100644
--- a/src/gui/platform/unix/dbusmenu/qdbusmenutypes.cpp
+++ b/src/gui/platform/unix/dbusmenu/qdbusmenutypes.cpp
@@ -204,7 +204,7 @@ QString QDBusMenuItem::convertMnemonic(const QString &label)
     // convert only the first occurrence of ampersand which is not at the end
     // dbusmenu uses underscore instead of ampersand
     int idx = label.indexOf(u'&');
-    if (idx < 0 || idx == label.length() - 1)
+    if (idx < 0 || idx == label.size() - 1)
         return label;
     QString ret(label);
     ret[idx] = u'_';
@@ -217,19 +217,19 @@ QDBusMenuShortcut QDBusMenuItem::convertKeySequence(const QKeySequence &sequence
     QDBusMenuShortcut shortcut;
     for (int i = 0; i < sequence.count(); ++i) {
         QStringList tokens;
-        int key = sequence[i].toCombined();
-        if (key & Qt::MetaModifier)
+        auto modifiers = sequence[i].keyboardModifiers();
+        if (modifiers & Qt::MetaModifier)
             tokens << QStringLiteral("Super");
-        if (key & Qt::ControlModifier)
+        if (modifiers & Qt::ControlModifier)
             tokens << QStringLiteral("Control");
-        if (key & Qt::AltModifier)
+        if (modifiers & Qt::AltModifier)
             tokens << QStringLiteral("Alt");
-        if (key & Qt::ShiftModifier)
+        if (modifiers & Qt::ShiftModifier)
             tokens << QStringLiteral("Shift");
-        if (key & Qt::KeypadModifier)
+        if (modifiers & Qt::KeypadModifier)
             tokens << QStringLiteral("Num");
 
-        QString keyName = QKeySequencePrivate::keyName(key, QKeySequence::PortableText);
+        QString keyName = QKeySequencePrivate::keyName(sequence[i].key(), QKeySequence::PortableText);
         if (keyName == "+"_L1)
             tokens << QStringLiteral("plus");
         else if (keyName == "-"_L1)
@@ -271,7 +271,7 @@ QDebug operator<<(QDebug d, const QDBusMenuLayoutItem &item)
 {
     QDebugStateSaver saver(d);
     d.nospace();
-    d << "QDBusMenuLayoutItem(id=" << item.m_id << ", properties=" << item.m_properties << ", " << item.m_children.count() << " children)";
+    d << "QDBusMenuLayoutItem(id=" << item.m_id << ", properties=" << item.m_properties << ", " << item.m_children.size() << " children)";
     return d;
 }
 #endif