mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2025-12-12 07:40:30 -08:00
use qt6 in arch builds (#4691)
* use qt6 in arch builds * fix 6.4.0 deprecations
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user