diff options
| author | kh1 <karsten.heimrich@digia.com> | 2014-06-02 09:46:41 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2014-06-02 09:57:13 +0200 |
| commit | e89721bce16d6486e47b5b88d24467face5a11aa (patch) | |
| tree | 268bad4a296f3dd02c83d1735fd7b76be38623d8 /src/libs/installer/downloadfiletask.cpp | |
| parent | d5b02dd37312ee9a9682caff9fae925c04323e8f (diff) | |
Cleanup to support Qt5 only.
Change-Id: Ib8f61229ce2f07e52c22a15e10dc817aca860ead
Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'src/libs/installer/downloadfiletask.cpp')
| -rw-r--r-- | src/libs/installer/downloadfiletask.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libs/installer/downloadfiletask.cpp b/src/libs/installer/downloadfiletask.cpp index 8d15a835d..0e29aebe6 100644 --- a/src/libs/installer/downloadfiletask.cpp +++ b/src/libs/installer/downloadfiletask.cpp @@ -239,7 +239,7 @@ void Downloader::onError(QNetworkReply::NetworkError error) void Downloader::onSslErrors(const QList<QSslError> &sslErrors) { -#if defined(QT_NO_SSL) || defined(QT_NO_OPENSSL) +#ifdef QT_NO_SSL Q_UNUSED(sslErrors); #else foreach (const QSslError &error, sslErrors) @@ -320,8 +320,7 @@ QNetworkReply *Downloader::startDownload(const FileTaskItem &item) connect(reply, SIGNAL(readyRead()), this, SLOT(onReadyRead())); connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onError(QNetworkReply::NetworkError))); -#ifndef QT_NO_OPENSSL - // TODO: once we switch to Qt5, use QT_NO_SSL instead of QT_NO_OPENSSL +#ifndef QT_NO_SSL connect(reply, SIGNAL(sslErrors(QList<QSslError>)), SLOT(onSslErrors(QList<QSslError>))); #endif connect(reply, SIGNAL(downloadProgress(qint64, qint64)), this, SLOT(onDownloadProgress(qint64, |