mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 23:28:14 +03:00
Code Issues Projects Releases Packages Wiki Activity

Remove all conditional checks for Qt 4.x (#5505)

Browse source
This commit is contained in:
Kiril Vladimiroff 2017-04-21 19:13:32 +03:00 committed by Markus Goetz
parent 05236f0a7a
commit 3a31694147
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libsync/account.cpp
View file

@ -215,9 +215,7 @@ QNetworkAccessManager *Account::networkAccessManager()
QNetworkReply *Account::sendRequest(const QByteArray &verb, const QUrl &url, QNetworkRequest req, QIODevice *data) QNetworkReply *Account::sendRequest(const QByteArray &verb, const QUrl &url, QNetworkRequest req, QIODevice *data)
{ {
req.setUrl(url); req.setUrl(url);
#if QT_VERSION > QT_VERSION_CHECK(4, 8, 4)
req.setSslConfiguration(this->getOrCreateSslConfig()); req.setSslConfiguration(this->getOrCreateSslConfig());
#endif
if (verb == "HEAD" && !data) { if (verb == "HEAD" && !data) {
return _am->head(req); return _am->head(req);
} else if (verb == "GET" && !data) { } else if (verb == "GET" && !data) {
@ -248,7 +246,7 @@ QSslConfiguration Account::getOrCreateSslConfig()
// if setting the client certificate fails, you will probably get an error similar to this: // if setting the client certificate fails, you will probably get an error similar to this:
// "An internal error number 1060 happened. SSL handshake failed, client certificate was requested: SSL error: sslv3 alert handshake failure" // "An internal error number 1060 happened. SSL handshake failed, client certificate was requested: SSL error: sslv3 alert handshake failure"
QSslConfiguration sslConfig = QSslConfiguration::defaultConfiguration(); QSslConfiguration sslConfig = QSslConfiguration::defaultConfiguration();
#if QT_VERSION > QT_VERSION_CHECK(5, 2, 0) #if QT_VERSION > QT_VERSION_CHECK(5, 2, 0)
// Try hard to re-use session for different requests // Try hard to re-use session for different requests
sslConfig.setSslOption(QSsl::SslOptionDisableSessionTickets, false); sslConfig.setSslOption(QSsl::SslOptionDisableSessionTickets, false);
@ -447,7 +445,7 @@ void Account::setNonShib(bool nonShib)
_davPath = Theme::instance()->webDavPathNonShib(); _davPath = Theme::instance()->webDavPathNonShib();
} else { } else {
_davPath = Theme::instance()->webDavPath(); _davPath = Theme::instance()->webDavPath();
} }
} }

5
src/libsync/propagateupload.cpp
View file

@ -89,10 +89,7 @@ void PUTFileJob::start() {
// For Qt versions not including https://codereview.qt-project.org/110150 // For Qt versions not including https://codereview.qt-project.org/110150
// Also do the runtime check if compiled with an old Qt but running with fixed one. // Also do the runtime check if compiled with an old Qt but running with fixed one.
// (workaround disabled on windows and mac because the binaries we ship have patched qt) // (workaround disabled on windows and mac because the binaries we ship have patched qt)
#if QT_VERSION < QT_VERSION_CHECK(4, 8, 7) #if QT_VERSION < QT_VERSION_CHECK(5, 4, 2) && !defined Q_OS_WIN && !defined Q_OS_MAC
if (QLatin1String(qVersion()) < QLatin1String("4.8.7"))
connect(_device, SIGNAL(wasReset()), this, SLOT(slotSoftAbort()));
#elif QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(5, 4, 2) && !defined Q_OS_WIN && !defined Q_OS_MAC
if (QLatin1String(qVersion()) < QLatin1String("5.4.2")) if (QLatin1String(qVersion()) < QLatin1String("5.4.2"))
connect(_device, SIGNAL(wasReset()), this, SLOT(slotSoftAbort())); connect(_device, SIGNAL(wasReset()), this, SLOT(slotSoftAbort()));
#endif #endif