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/kdtools | |
| parent | d5b02dd37312ee9a9682caff9fae925c04323e8f (diff) | |
Cleanup to support Qt5 only.
Change-Id: Ib8f61229ce2f07e52c22a15e10dc817aca860ead
Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'src/libs/kdtools')
| -rw-r--r-- | src/libs/kdtools/kdupdaterfiledownloader.cpp | 6 | ||||
| -rw-r--r-- | src/libs/kdtools/kdupdaterfiledownloader_p.h | 3 | ||||
| -rw-r--r-- | src/libs/kdtools/kdupdaterfiledownloaderfactory.cpp | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/libs/kdtools/kdupdaterfiledownloader.cpp b/src/libs/kdtools/kdupdaterfiledownloader.cpp index f2063c8c4..96baf88b3 100644 --- a/src/libs/kdtools/kdupdaterfiledownloader.cpp +++ b/src/libs/kdtools/kdupdaterfiledownloader.cpp @@ -823,8 +823,7 @@ KDUpdater::HttpDownloader::HttpDownloader(QObject *parent) : KDUpdater::FileDownloader(QLatin1String("http"), parent) , d(new Private(this)) { -#ifndef QT_NO_OPENSSL - // TODO: once we switch to Qt5, use QT_NO_SSL instead of QT_NO_OPENSSL +#ifndef QT_NO_SSL connect(&d->manager, SIGNAL(sslErrors(QNetworkReply*, QList<QSslError>)), this, SLOT(onSslErrors(QNetworkReply*, QList<QSslError>))); #endif @@ -1067,11 +1066,10 @@ void KDUpdater::HttpDownloader::onAuthenticationRequired(QNetworkReply *reply, Q } } -#ifndef QT_NO_OPENSSL +#ifndef QT_NO_SSL #include "messageboxhandler.h" -// TODO: once we switch to Qt5, use QT_NO_SSL instead of QT_NO_OPENSSL void KDUpdater::HttpDownloader::onSslErrors(QNetworkReply* reply, const QList<QSslError> &errors) { Q_UNUSED(reply) diff --git a/src/libs/kdtools/kdupdaterfiledownloader_p.h b/src/libs/kdtools/kdupdaterfiledownloader_p.h index c5019cae6..f5612f6ba 100644 --- a/src/libs/kdtools/kdupdaterfiledownloader_p.h +++ b/src/libs/kdtools/kdupdaterfiledownloader_p.h @@ -141,8 +141,7 @@ private Q_SLOTS: void httpDone(bool error); void httpReqFinished(); void onAuthenticationRequired(QNetworkReply *reply, QAuthenticator *authenticator); -#ifndef QT_NO_OPENSSL - // TODO: once we switch to Qt5, use QT_NO_SSL instead of QT_NO_OPENSSL +#ifndef QT_NO_SSL void onSslErrors(QNetworkReply* reply, const QList<QSslError> &errors); #endif private: diff --git a/src/libs/kdtools/kdupdaterfiledownloaderfactory.cpp b/src/libs/kdtools/kdupdaterfiledownloaderfactory.cpp index 92dff42ee..cd6b552a5 100644 --- a/src/libs/kdtools/kdupdaterfiledownloaderfactory.cpp +++ b/src/libs/kdtools/kdupdaterfiledownloaderfactory.cpp @@ -77,8 +77,7 @@ FileDownloaderFactory::FileDownloaderFactory() registerFileDownloader<HttpDownloader>(QLatin1String("http")); registerFileDownloader<ResourceFileDownloader >(QLatin1String("resource")); -#ifndef QT_NO_OPENSSL - // TODO: once we switch to Qt5, use QT_NO_SSL instead of QT_NO_OPENSSL +#ifndef QT_NO_SSL if (QSslSocket::supportsSsl()) registerFileDownloader<HttpDownloader>(QLatin1String("https")); else |