[qt] Deprecate Qt4 and old versions of Qt5

Not enough adoption to keep the platform alive.
This commit is contained in:
Thiago Marcos P. Santos
2018-11-12 16:38:34 +02:00
parent b891a8d6b0
commit cd92a231b3
20 changed files with 181 additions and 387 deletions

View File

@@ -29,9 +29,7 @@ void HTTPFileSource::Impl::request(HTTPRequest* req)
}
QNetworkRequest networkRequest = req->networkRequest();
#if QT_VERSION >= 0x050600
networkRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
#endif
data.first = m_manager->get(networkRequest);
connect(data.first, SIGNAL(finished()), this, SLOT(onReplyFinished()));
@@ -60,15 +58,7 @@ void HTTPFileSource::Impl::cancel(HTTPRequest* req)
if (requestsVector.empty()) {
m_pending.erase(it);
#if QT_VERSION >= 0x050000
reply->abort();
#else
// XXX: We should be aborting the reply here
// but a bug on Qt4 causes the connection of
// other ongoing requests to drop if we call
// abort() too often (and we do).
Q_UNUSED(reply);
#endif
}
}
@@ -105,11 +95,7 @@ std::unique_ptr<AsyncRequest> HTTPFileSource::request(const Resource& resource,
}
uint32_t HTTPFileSource::maximumConcurrentRequests() {
#if QT_VERSION >= 0x050000
return 20;
#else
return 10;
#endif
}
} // namespace mbgl