jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-08 11:03:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[Oracle] Fix Qt6 build and treat unknown memory as sufficient

Browse source 
Use QRegularExpression behind the same Qt version guard as
totalMemoryBytes() in availableMemoryBytes(), where a bare QRegExp
broke every Qt6 Linux build. hasAtLeastGiB() now treats a 0 reading
(unsupported platform or failed query) as unknown and skips the
low-memory prompt instead of misreading it as low memory.
This commit is contained in:
Lukas Brübach 2026-10-11 15:25:36 +02:00
parent 2c0c8b416a
commit fdbc4734a4
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libcockatrice_utility/libcockatrice/utility/system_memory_querier.cpp
View file

@ -84,7 +84,11 @@ qulonglong SystemMemoryQuerier::availableMemoryBytes()
while (!in.atEnd()) { while (!in.atEnd()) {
QString line = in.readLine(); QString line = in.readLine();
if (line.startsWith("MemAvailable:")) { if (line.startsWith("MemAvailable:")) {
QStringList parts = line.split(QRegExp("\\s+"), Qt::SkipEmptyParts); #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QStringList parts = line.split(QRegExp("\\s+"), QString::SkipEmptyParts);
#else
QStringList parts = line.split(QRegularExpression("\\s+"), Qt::SkipEmptyParts);
#endif
if (parts.size() >= 2) if (parts.size() >= 2)
return parts[1].toULongLong() * 1024; return parts[1].toULongLong() * 1024;
} }

8
libcockatrice_utility/libcockatrice/utility/system_memory_querier.h
View file

@ -11,8 +11,14 @@ public:
static bool hasAtLeastGiB(int gib) static bool hasAtLeastGiB(int gib)
{ {
const qulonglong total = totalMemoryBytes();
// 0 means the amount could not be determined (unsupported platform or failed query).
// Treat it as unknown and skip the check instead of misreading it as low memory.
if (total == 0) {
return true;
}
const qulonglong GiB = 1024ull * 1024ull * 1024ull; const qulonglong GiB = 1024ull * 1024ull * 1024ull;
return totalMemoryBytes() >= (qulonglong)gib * GiB; return total >= (qulonglong)gib * GiB;
} }
}; };