whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QNetworkAccessManager: move #ifery out of if-condition 

for legibility

Change-Id: Id5bc2471e79bb8560cec46068cc72573f6adec34
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
bb10
Mårten Nordheim 2021-08-23 15:34:09 +02:00
parent 0e9b75eab2
commit 4fee73c444
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/network/access/qnetworkaccessmanager.cpp
View File

@ -1223,12 +1223,16 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
#endif
#if QT_CONFIG(http)
// Since Qt 5 we use the new QNetworkReplyHttpImpl
if (scheme == QLatin1String("http") || scheme == QLatin1String("preconnect-http")
constexpr char16_t httpSchemes[][17] = {
u"http",
u"preconnect-http",
#ifndef QT_NO_SSL
|| scheme == QLatin1String("https") || scheme == QLatin1String("preconnect-https")
u"https",
u"preconnect-https",
#endif
) {
};
// Since Qt 5 we use the new QNetworkReplyHttpImpl
if (std::find(std::begin(httpSchemes), std::end(httpSchemes), scheme) != std::end(httpSchemes)) {
#ifndef QT_NO_SSL
if (isStrictTransportSecurityEnabled() && d->stsCache.isKnownHost(request.url())) {
QUrl stsUrl(request.url());