mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-27 15:05:19 +03:00
Remove all conditional checks for Qt 4.x (#5505)
This commit is contained in:
parent
05236f0a7a
commit
3a31694147
2 changed files with 3 additions and 8 deletions
|
@ -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) {
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue