Commit ae84fb59 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

We depend against kf5.83/qt5.15

parent f359b92c
Pipeline #66918 passed with stage
in 8 minutes and 35 seconds
...@@ -60,11 +60,7 @@ void KioLogFileReader::open() ...@@ -60,11 +60,7 @@ void KioLogFileReader::open()
connect(mFileJob, SIGNAL(close(KIO::Job *)), this, SLOT(closeDone(KIO::Job *))); connect(mFileJob, SIGNAL(close(KIO::Job *)), this, SLOT(closeDone(KIO::Job *)));
connect(mFileJob, &KIO::FileJob::data, this, &KioLogFileReader::dataReceived); connect(mFileJob, &KIO::FileJob::data, this, &KioLogFileReader::dataReceived);
#if KIO_VERSION < QT_VERSION_CHECK(5, 78, 0)
connect(mFileJob, &KIO::FileJob::mimetype, this, &KioLogFileReader::mimetypeReceived);
#else
connect(mFileJob, &KIO::FileJob::mimeTypeFound, this, &KioLogFileReader::mimetypeReceived); connect(mFileJob, &KIO::FileJob::mimeTypeFound, this, &KioLogFileReader::mimetypeReceived);
#endif
logDebug() << "File opened."; logDebug() << "File opened.";
} }
......
...@@ -287,11 +287,7 @@ void JournaldNetworkAnalyzer::sendRequest(RequestType requestType) ...@@ -287,11 +287,7 @@ void JournaldNetworkAnalyzer::sendRequest(RequestType requestType)
mReply = mNetworkManager.get(request); mReply = mNetworkManager.get(request);
connect(mReply, &QNetworkReply::finished, this, &JournaldNetworkAnalyzer::httpFinished); connect(mReply, &QNetworkReply::finished, this, &JournaldNetworkAnalyzer::httpFinished);
connect(mReply, &QNetworkReply::readyRead, this, &JournaldNetworkAnalyzer::httpReadyRead); connect(mReply, &QNetworkReply::readyRead, this, &JournaldNetworkAnalyzer::httpReadyRead);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(mReply, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &JournaldNetworkAnalyzer::httpError);
#else
connect(mReply, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::errorOccurred), this, &JournaldNetworkAnalyzer::httpError); connect(mReply, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::errorOccurred), this, &JournaldNetworkAnalyzer::httpError);
#endif
} }
void JournaldNetworkAnalyzer::updateStatus(const QString &status) void JournaldNetworkAnalyzer::updateStatus(const QString &status)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment