jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-14 19:18:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: fix qt5 builds on macos 15 (#5923)

Browse source 
Although this config is not built on CI, while trying to compile locally, the build failed due to warnings and -Werror.
Some qt functions were actually deprecated (but not removed) before version 6.0.0 and clang (righfully) complains about comparison between different types of enums.
This commit is contained in:
Bruno Alexandre Rosa 2025-05-07 01:18:59 +00:00 • committed by GitHub
parent 286a7494d3
commit 4c3cfc8c2d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/server/remote/remote_client.cpp
View file

@ -43,7 +43,7 @@ RemoteClient::RemoteClient(QObject *parent)
connect(socket, &QTcpSocket::connected, this, &RemoteClient::slotConnected); connect(socket, &QTcpSocket::connected, this, &RemoteClient::slotConnected);
connect(socket, &QTcpSocket::readyRead, this, &RemoteClient::readData); connect(socket, &QTcpSocket::readyRead, this, &RemoteClient::readData);
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
connect(socket, &QTcpSocket::errorOccurred, this, &RemoteClient::slotSocketError); connect(socket, &QTcpSocket::errorOccurred, this, &RemoteClient::slotSocketError);
#else #else
connect(socket, qOverload<QAbstractSocket::SocketError>(&QTcpSocket::error), this, &RemoteClient::slotSocketError); connect(socket, qOverload<QAbstractSocket::SocketError>(&QTcpSocket::error), this, &RemoteClient::slotSocketError);

2
cockatrice/src/settings/shortcut_treeview.cpp
View file

@ -150,7 +150,7 @@ void ShortcutTreeView::currentChanged(const QModelIndex &current, const QModelIn
*/ */
void ShortcutTreeView::updateSearchString(const QString &searchString) void ShortcutTreeView::updateSearchString(const QString &searchString)
{ {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION > QT_VERSION_CHECK(5, 14, 0)
const auto skipEmptyParts = Qt::SkipEmptyParts; const auto skipEmptyParts = Qt::SkipEmptyParts;
#else #else
const auto skipEmptyParts = QString::SkipEmptyParts; const auto skipEmptyParts = QString::SkipEmptyParts;

12
cockatrice/src/utility/card_info_comparator.cpp
View file

@ -37,17 +37,17 @@ bool CardInfoComparator::compareVariants(const QVariant &a, const QVariant &b) c
// Perform type-specific comparison // Perform type-specific comparison
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
switch (a.typeId()) { switch (static_cast<int>(a.typeId())) {
#else #else
switch (a.type()) { switch (static_cast<int>(a.type())) {
#endif #endif
case QMetaType::Int: case static_cast<int>(QMetaType::Int):
return a.toInt() < b.toInt(); return a.toInt() < b.toInt();
case QMetaType::Double: case static_cast<int>(QMetaType::Double):
return a.toDouble() < b.toDouble(); return a.toDouble() < b.toDouble();
case QMetaType::QString: case static_cast<int>(QMetaType::QString):
return a.toString() < b.toString(); return a.toString() < b.toString();
case QMetaType::Bool: case static_cast<int>(QMetaType::Bool):
return a.toBool() < b.toBool(); return a.toBool() < b.toBool();
default: default:
// Default to comparing as strings // Default to comparing as strings