diff options
| author | Simon Rettberg | 2022-10-31 15:53:01 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2022-10-31 15:53:01 +0100 |
| commit | eb2bafc3d2b36f7bbb7012bee3a21bacb8cf50e2 (patch) | |
| tree | 76d336d9ab2538db4c87fd4eb63b9a8b687c01d3 /src/server | |
| parent | Remove incomplete languages (diff) | |
| download | pvs2-eb2bafc3d2b36f7bbb7012bee3a21bacb8cf50e2.tar.gz pvs2-eb2bafc3d2b36f7bbb7012bee3a21bacb8cf50e2.tar.xz pvs2-eb2bafc3d2b36f7bbb7012bee3a21bacb8cf50e2.zip | |
Add a few hacks to make it compile on Qt 5.12 again
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/net/certmanager.cpp | 2 | ||||
| -rw-r--r-- | src/server/net/client.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/server/net/certmanager.cpp b/src/server/net/certmanager.cpp index 968535a..5a4f904 100644 --- a/src/server/net/certmanager.cpp +++ b/src/server/net/certmanager.cpp @@ -19,6 +19,8 @@ #include "certmanager.h" #include "../../shared/util.h" +// Remove in future - see comment in util.h +#undef errorOccurred #include <QHash> #include <QDir> diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp index 08dfc9a..bf1ad25 100644 --- a/src/server/net/client.cpp +++ b/src/server/net/client.cpp @@ -31,7 +31,7 @@ Client::Client(QTcpSocket* socket) // Connect important signals connect(_socket, &QTcpSocket::disconnected, this, &Client::disconnect); - connect(_socket, &QTcpSocket::errorOccurred, + connect(_socket, QOverload<QAbstractSocket::SocketError>::of(&QTcpSocket::errorOccurred), this, &Client::disconnect); auto *ssl = qobject_cast<QSslSocket*>(_socket); if (ssl != nullptr) { |