aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use qt6 in arch builds (#4691)

Browse source 
* use qt6 in arch builds

* fix 6.4.0 deprecations
This commit is contained in:
ebbit1q 2022-10-31 23:26:13 +01:00 committed by GitHub
parent dec2a252fa
commit 3d4858b840
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.ci/ArchLinux/Dockerfile
View file

@ -8,9 +8,10 @@ RUN pacman --sync --refresh --sysupgrade --needed --noconfirm \
gtest \ gtest \
mariadb-libs \ mariadb-libs \
protobuf \ protobuf \
qt5-base \ qt6-base \
qt5-multimedia \ qt6-multimedia \
qt5-svg \ qt6-svg \
qt5-tools \ qt6-tools \
qt5-websockets \ qt6-translations \
qt6-websockets \
&& pacman --sync --clean --clean --noconfirm && pacman --sync --clean --clean --noconfirm

2
cockatrice/src/player.cpp
View file

@ -594,7 +594,7 @@ void Player::removePlayer(Player *player)
void Player::playerListActionTriggered() void Player::playerListActionTriggered()
{ {
auto *action = static_cast<QAction *>(sender()); auto *action = static_cast<QAction *>(sender());
auto *menu = static_cast<QMenu *>(action->parentWidget()); auto *menu = static_cast<QMenu *>(action->parent());
Command_RevealCards cmd; Command_RevealCards cmd;
const int otherPlayerId = action->data().toInt(); const int otherPlayerId = action->data().toInt();

4
servatrice/src/smtp/qxthmac.cpp
View file

@ -167,7 +167,11 @@ bool QxtHmac::verify(const QByteArray& otherInner)
void QxtHmac::addData(const char* data, int length) void QxtHmac::addData(const char* data, int length)
{ {
Q_ASSERT(qxt_d().opad.size()); 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); qxt_d().ihash->addData(data, length);
#endif
qxt_d().result.clear(); qxt_d().result.clear();
} }