diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-05-16 20:34:07 +0200 |
|---|---|---|
| committer | Sefa Eyeoglu <contact@scrumplex.net> | 2022-07-10 12:19:15 +0200 |
| commit | 15c5bbcf222e9baa705ec0dfe5504b9db2d030ae (patch) | |
| tree | 775709f036726aff249246afd4c7886c77a981b6 /launcher/net | |
| parent | c36342371819a4983b5ac2b928acc6a78b857ed8 (diff) | |
| download | PrismLauncher-15c5bbcf222e9baa705ec0dfe5504b9db2d030ae.tar.gz PrismLauncher-15c5bbcf222e9baa705ec0dfe5504b9db2d030ae.tar.bz2 PrismLauncher-15c5bbcf222e9baa705ec0dfe5504b9db2d030ae.zip | |
fix: fix slots for Qt 6
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
Diffstat (limited to 'launcher/net')
| -rw-r--r-- | launcher/net/Download.cpp | 4 | ||||
| -rw-r--r-- | launcher/net/PasteUpload.cpp | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/launcher/net/Download.cpp b/launcher/net/Download.cpp index d93eb088..6613c336 100644 --- a/launcher/net/Download.cpp +++ b/launcher/net/Download.cpp @@ -126,7 +126,11 @@ void Download::executeTask() m_reply.reset(rep); connect(rep, &QNetworkReply::downloadProgress, this, &Download::downloadProgress); connect(rep, &QNetworkReply::finished, this, &Download::downloadFinished); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + connect(rep, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), SLOT(downloadError(QNetworkReply::NetworkError))); +#else connect(rep, SIGNAL(error(QNetworkReply::NetworkError)), SLOT(downloadError(QNetworkReply::NetworkError))); +#endif connect(rep, &QNetworkReply::sslErrors, this, &Download::sslErrors); connect(rep, &QNetworkReply::readyRead, this, &Download::downloadReadyRead); } diff --git a/launcher/net/PasteUpload.cpp b/launcher/net/PasteUpload.cpp index 835e4cd1..76b86743 100644 --- a/launcher/net/PasteUpload.cpp +++ b/launcher/net/PasteUpload.cpp @@ -129,10 +129,13 @@ void PasteUpload::executeTask() connect(rep, &QNetworkReply::uploadProgress, this, &Task::setProgress); connect(rep, &QNetworkReply::finished, this, &PasteUpload::downloadFinished); - // This function call would be a lot shorter if we were using the latest Qt - connect(rep, - static_cast<void (QNetworkReply::*)(QNetworkReply::NetworkError)>(&QNetworkReply::error), - this, &PasteUpload::downloadError); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) + connect(rep, &QNetworkReply::errorOccurred, this, &PasteUpload::downloadError); +#else + connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &PasteUpload::downloadError); +#endif + m_reply = std::shared_ptr<QNetworkReply>(rep); |