Changeset 94031 in vbox for trunk/src

Timestamp:

Mar 1, 2022 11:16:54 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

150264

Message:

FE/Qt: qt6: QList, QSet & QVector adjustments. [build fix] bugref:9898

• QList::toSet was removed in "favor" of QSet's range constructors (5.14+). Similarly QSet::fromList. Very tedious and there were some unnecessary QSet conversions.
• QVector was mapped to QList and fromStdVector discontinued in 6.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp

@@ -1641 +1641 @@
     {
         const QList<int> &pressedKeyList = m_pressedHostComboKeys.keys();
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
         fIsFullHostComboPresent =    QSet<int>(allHostComboKeys.begin(), allHostComboKeys.end())
                                   == QSet<int>(pressedKeyList.begin(), pressedKeyList.end());
+#else
+        fIsFullHostComboPresent = allHostComboKeys.toSet() == pressedKeyList.toSet();
+#endif
     }