From 3d4858b84040068b8593e0eb133ddb51fffb8c51 Mon Sep 17 00:00:00 2001
From: ebbit1q <ebbit1q@gmail.com>
Date: Mon, 31 Oct 2022 23:26:13 +0100
Subject: [PATCH] use qt6 in arch builds (#4691)

* use qt6 in arch builds

* fix 6.4.0 deprecations
---
 .ci/ArchLinux/Dockerfile        | 11 ++++++-----
 cockatrice/src/player.cpp       |  2 +-
 servatrice/src/smtp/qxthmac.cpp |  4 ++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.ci/ArchLinux/Dockerfile b/.ci/ArchLinux/Dockerfile
index 86fc1404..742d1818 100644
--- a/.ci/ArchLinux/Dockerfile
+++ b/.ci/ArchLinux/Dockerfile
@@ -8,9 +8,10 @@ RUN pacman --sync --refresh --sysupgrade --needed --noconfirm \
         gtest \
         mariadb-libs \
         protobuf \
-        qt5-base \
-        qt5-multimedia \
-        qt5-svg \
-        qt5-tools \
-        qt5-websockets \
+        qt6-base \
+        qt6-multimedia \
+        qt6-svg \
+        qt6-tools \
+        qt6-translations \
+        qt6-websockets \
     && pacman --sync --clean --clean --noconfirm
diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp
index b44c0ea0..fc49b9d5 100644
--- a/cockatrice/src/player.cpp
+++ b/cockatrice/src/player.cpp
@@ -594,7 +594,7 @@ void Player::removePlayer(Player *player)
 void Player::playerListActionTriggered()
 {
     auto *action = static_cast<QAction *>(sender());
-    auto *menu = static_cast<QMenu *>(action->parentWidget());
+    auto *menu = static_cast<QMenu *>(action->parent());
 
     Command_RevealCards cmd;
     const int otherPlayerId = action->data().toInt();
diff --git a/servatrice/src/smtp/qxthmac.cpp b/servatrice/src/smtp/qxthmac.cpp
index 0cbca1c5..3b7489f7 100644
--- a/servatrice/src/smtp/qxthmac.cpp
+++ b/servatrice/src/smtp/qxthmac.cpp
@@ -167,7 +167,11 @@ bool QxtHmac::verify(const QByteArray& otherInner)
 void QxtHmac::addData(const char* data, int length)
 {
     Q_ASSERT(qxt_d().opad.size());
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 3, 0))
+    qxt_d().ihash->addData(QByteArrayView(data, length));
+#else
     qxt_d().ihash->addData(data, length);
+#endif
     qxt_d().result.clear();
 }