[Pkg-owncloud-commits] [owncloud-client] 05/11: Disable setSslConfiguration calls for older Qt version

Sandro Knauß hefee-guest at moszumanska.debian.org
Thu May 7 14:43:32 UTC 2015


This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit bceb40ed8050745d52631b185c5f0975ce75073d
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Wed May 6 11:20:16 2015 +0200

    Disable setSslConfiguration calls for older Qt version
    
    This is only required for client certs, which currently have
    no GUI anyway and are experimental.
---
 src/libsync/account.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
index 9b8941f..c6aac47 100644
--- a/src/libsync/account.cpp
+++ b/src/libsync/account.cpp
@@ -321,7 +321,9 @@ QNetworkReply *Account::getRequest(const QString &relPath)
 QNetworkReply *Account::getRequest(const QUrl &url)
 {
     QNetworkRequest request(url);
+#if QT_VERSION > QT_VERSION_CHECK(4, 8, 4)
     request.setSslConfiguration(this->createSslConfig());
+#endif
     return _am->get(request);
 }
 
@@ -333,7 +335,9 @@ QNetworkReply *Account::davRequest(const QByteArray &verb, const QString &relPat
 QNetworkReply *Account::davRequest(const QByteArray &verb, const QUrl &url, QNetworkRequest req, QIODevice *data)
 {
     req.setUrl(url);
+#if QT_VERSION > QT_VERSION_CHECK(4, 8, 4)
     req.setSslConfiguration(this->createSslConfig());
+#endif
     return _am->sendCustomRequest(req, verb, data);
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git



More information about the Pkg-owncloud-commits mailing list