jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-16 15:32:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: build on both qt < and >= 6.10.0

Browse source
This commit is contained in:
Bruno Alexandre Rosa 2025-10-10 15:29:02 -03:00
parent 3ae4a7d8a7
commit 1a62ee2e57
8 changed files with 57 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
View file

@ -36,8 +36,8 @@ CardDatabaseLoader::~CardDatabaseLoader()
LoadStatus CardDatabaseLoader::loadFromFile(const QString &fileName)
{
QFile file(fileName);
file.open(QIODevice::ReadOnly);
if (!file.isOpen()) {
const auto isOpen = file.open(QIODevice::ReadOnly);
if (!isOpen) {
return FileError;
}

7
libcockatrice_card/libcockatrice/card/database/model/card_database_display_model.cpp
View file

@ -188,9 +188,16 @@ void CardDatabaseDisplayModel::clearFilterAll()
cardText.clear();
cardTypes.clear();
cardColors.clear();
#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
beginFilterChange();
#endif
if (filterTree != nullptr)
filterTree->clear();
#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
endFilterChange();
#else
invalidateFilter();
#endif
}
void CardDatabaseDisplayModel::setFilterTree(FilterTree *_filterTree)