jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bump minimum Qt version from 5.8 to 5.15 (#6442)

Browse source 
* Bump minimum Qt version from 5.8 to 5.15

* remove version check

* remove version checks
This commit is contained in:
RickyRister 2025-12-23 09:58:23 -08:00 • committed by GitHub
parent 521046fb09
commit 70f9982c29
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
31 changed files with 5 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

8
servatrice/src/isl_interface.cpp
View file

@ -112,11 +112,7 @@ void IslInterface::initServer()
socket->startServerEncryption();
if (!socket->waitForEncrypted(5000)) {
#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
QList<QSslError> sslErrors(socket->sslHandshakeErrors());
#else
QList<QSslError> sslErrors(socket->sslErrors());
#endif
if (sslErrors.isEmpty())
qDebug() << "[ISL] SSL handshake timeout, terminating connection";
else
@ -193,11 +189,7 @@ void IslInterface::initClient()
return;
}
if (!socket->waitForEncrypted(5000)) {
#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
QList<QSslError> sslErrors(socket->sslHandshakeErrors());
#else
QList<QSslError> sslErrors(socket->sslErrors());
#endif
if (sslErrors.isEmpty())
qDebug() << "[ISL] SSL handshake timeout, terminating connection";
else