dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Require Qt 5.9

Browse Source
This commit is contained in:
Jonas Kvinge
2022-01-29 21:33:33 +01:00
parent fd5970b647
commit 63e5d6a94a
36 changed files with 3 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/filesystemmusicstorage.cpp
View File

@@ -80,13 +80,11 @@ bool FilesystemMusicStorage::CopyToStorage(const CopyJob &job) {
QFile::rename(cover_src.absoluteFilePath(), cover_dest.absoluteFilePath());
}
// Remove empty directories.
#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
QDir remove_dir(src.absolutePath(), QString(), QDir::Name, QDir::NoDotAndDotDot);
while (remove_dir.isEmpty()) {
if (!QDir().rmdir(remove_dir.absolutePath())) break;
remove_dir.cdUp();
}
#endif
}
else {
if (dest.exists() && !job.overwrite_) {

7
src/core/networkaccessmanager.cpp
View File

@@ -37,10 +37,7 @@
NetworkAccessManager::NetworkAccessManager(QObject *parent)
: QNetworkAccessManager(parent) {
#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
#endif
setCache(new ThreadSafeNetworkDiskCache(this));
}
@@ -56,11 +53,7 @@ QNetworkReply *NetworkAccessManager::createRequest(Operation op, const QNetworkR
}
QNetworkRequest new_request(request);
#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
new_request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
#else
new_request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
#endif
new_request.setRawHeader("User-Agent", user_agent);
if (op == QNetworkAccessManager::PostOperation && !new_request.header(QNetworkRequest::ContentTypeHeader).isValid()) {