From 0a0c8948eeb399fba6dc3535886209db072acef1 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Thu, 8 Apr 2010 16:33:47 +0000 Subject: [PATCH] Improved previous patch --- src/downloadthread.cpp | 4 ++-- src/downloadthread.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/downloadthread.cpp b/src/downloadthread.cpp index beb0651fc..27a9c9530 100644 --- a/src/downloadthread.cpp +++ b/src/downloadthread.cpp @@ -42,7 +42,7 @@ enum ProxyType {HTTP=1, SOCKS5=2, HTTP_PW=3, SOCKS5_PW=4, SOCKS4=5}; downloadThread::downloadThread(QObject* parent) : QObject(parent) { networkManager = new QNetworkAccessManager(this); connect(networkManager, SIGNAL(finished (QNetworkReply*)), this, SLOT(processDlFinished(QNetworkReply*))); -#if !defined(Q_WS_PM) +#ifndef QT_NO_OPENSSL connect(networkManager, SIGNAL(sslErrors(QNetworkReply*,QList)), this, SLOT(ignoreSslErrors(QNetworkReply*,QList))); #endif } @@ -217,7 +217,7 @@ QString downloadThread::errorCodeToString(QNetworkReply::NetworkError status) { } } -#if !defined(Q_WS_PM) +#ifndef QT_NO_OPENSSL void downloadThread::ignoreSslErrors(QNetworkReply* reply,QList errors) { Q_UNUSED(errors) // Ignore all SSL errors diff --git a/src/downloadthread.h b/src/downloadthread.h index e3352abe2..5c9fb2646 100644 --- a/src/downloadthread.h +++ b/src/downloadthread.h @@ -63,7 +63,7 @@ protected: protected slots: void processDlFinished(QNetworkReply* reply); void checkDownloadSize(qint64 bytesReceived, qint64 bytesTotal); -#if !defined(Q_WS_PM) +#ifndef QT_NO_OPENSSL void ignoreSslErrors(QNetworkReply*,QList); #endif