[Pkg-owncloud-commits] [owncloud-client] 282/333: Fix compilation with Qt5

Sandro Knauß hefee-guest at moszumanska.debian.org
Thu Apr 17 23:17:04 UTC 2014


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 d5d3c1a23a2eee31b25b0fd5aea5c1d1e5022b4a
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Apr 2 16:20:09 2014 +0200

    Fix compilation with Qt5
    
    We don't need QtWidgets,  and we don't need Uility::escape
---
 src/owncloudcmd/simplesslerrorhandler.cpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/owncloudcmd/simplesslerrorhandler.cpp b/src/owncloudcmd/simplesslerrorhandler.cpp
index 5a6dcec..10d06e7 100644
--- a/src/owncloudcmd/simplesslerrorhandler.cpp
+++ b/src/owncloudcmd/simplesslerrorhandler.cpp
@@ -17,18 +17,8 @@
 
 #include <QtGui>
 #include <QtNetwork>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets>
-#endif
 
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-namespace Utility {
-    //  Used for QSSLCertificate::subjectInfo which returns a QStringList in Qt5, but a QString in Qt4
-    QString escape(const QStringList &l) { return escape(l.join(';')); }
-}
-#endif
-
 bool SimpleSslErrorHandler::handleErrors(QList<QSslError> errors, QList<QSslCertificate> *certs, Account *account)
 {
     (void) account;

-- 
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