diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-06-05 13:21:31 +0200 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-06-05 13:21:31 +0200 |
| commit | 8d413b583ee06f4aec9cea1a3ce592df1a2ce0df (patch) | |
| tree | 5140d589b3574798d4c82f36644ddee4c3a150ec /src/network | |
| parent | c010fffcae27d48bf4e418c59f6893af2ffe19db (diff) | |
| parent | c30e1e61e30fa74616adf22995f90192ad54cf2c (diff) | |
Merge branch '2.3' of github.com:mixxxdj/mixxx
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/jsonwebtask.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/network/jsonwebtask.cpp b/src/network/jsonwebtask.cpp index 6a9efdfccf..6202a48759 100644 --- a/src/network/jsonwebtask.cpp +++ b/src/network/jsonwebtask.cpp @@ -256,7 +256,11 @@ bool JsonWebTask::doStart( Qt::UniqueConnection); connect(m_pendingNetworkReply, - qOverload<QNetworkReply::NetworkError>(&QNetworkReply::error), +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) + &QNetworkReply::errorOccurred, +#else + QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), +#endif this, &JsonWebTask::slotNetworkReplyFinished, Qt::UniqueConnection); |