Qt5 compat

psi-im · May 5, 2024 · 3bbfb71 · 3bbfb71
1 parent afc2fae
commit 3bbfb71
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/groupchattopicdlg.cpp b/src/groupchattopicdlg.cpp
@@ -16,7 +16,7 @@ GroupchatTopicDlg::GroupchatTopicDlg(GCMainDlg *parent) :
     QKeySequence sendKey = ShortcutManager::instance()->shortcut("chat.send");
     if (sendKey == QKeySequence(Qt::Key_Enter) || sendKey == QKeySequence(Qt::Key_Return)) {
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-        sendKey = QKeySequence(Qt::CTRL | Qt::Key_Return);
+        sendKey = QKeySequence(quint32(Qt::CTRL) | quint32(Qt::Key_Return));
 #else
         sendKey = QKeySequence(QKeyCombination(Qt::CTRL, Qt::Key_Return));
 #endif

diff --git a/src/options/opt_chat.cpp b/src/options/opt_chat.cpp
@@ -90,8 +90,8 @@ void OptionsTabChat::applyOptions()
             vl << QVariant::fromValue(QKeySequence(Qt::Key_Enter)) << QVariant::fromValue(QKeySequence(Qt::Key_Return));
         } else {
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-            vl << QVariant::fromValue(QKeySequence(Qt::Key_Enter | Qt::CTRL))
-               << QVariant::fromValue(QKeySequence(Qt::CTRL | Qt::Key_Return));
+            vl << QVariant::fromValue(QKeySequence(quint32(Qt::Key_Enter) | quint32(Qt::CTRL)))
+               << QVariant::fromValue(QKeySequence(quint32(Qt::CTRL) | quint32(Qt::Key_Return)));
 #else
             vl << QVariant::fromValue(QKeySequence(QKeyCombination(Qt::CTRL, Qt::Key_Enter)))
                << QVariant::fromValue(QKeySequence(QKeyCombination(Qt::CTRL, Qt::Key_Return)));

diff --git a/src/widgets/iconselect.cpp b/src/widgets/iconselect.cpp
@@ -384,7 +384,7 @@ void IconSelect::updateGrid()
         std::transform(sorted.begin(), sorted.end(), std::back_inserter(toRender),
                        [](auto icon) { return Item { icon }; });
     } else {
-        QSizeF totalSize;
+        QSizeF      totalSize;
         auto const &er = EmojiRegistry::instance();
         for (auto it = er.begin(); it != er.end(); ++it) {
 #ifdef Q_OS_WIN
@@ -396,7 +396,7 @@ void IconSelect::updateGrid()
             if (titleFilter.isEmpty() || emoji.name.contains(titleFilter)) {
                 auto rect = QFontMetrics(font).boundingRect(emoji.code);
                 if (!rect.isEmpty() && rect.width() < rect.height() * 1.4 && rect.height() < rect.width() * 1.4) {
-                    totalSize += rect.size().toSizeF();
+                    totalSize += rect.size();
                     toRender.emplace_back(nullptr, &emoji);
                     if (!titleFilter.isEmpty() && toRender.size() == 40) {
                         break;