0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Qt < 5.14.0 compat

Browse Source 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers 2023-02-09 20:02:20 -07:00
parent 2837236d81
commit 34ac8b3ec3
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
launcher/FileSystem.cpp
View File

@ -38,6 +38,7 @@
#include "FileSystem.h"
#include <qdebug.h>
#include <qfileinfo.h>
#include <qnamespace.h>
#include <qstorageinfo.h>
#include "BuildConfig.h"
@ -587,9 +588,13 @@ int PathDepth(const QString& path)
QFileInfo info(path);
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
auto parts = QDir::toNativeSeparators(info.path()).split(QDir::separator(), QString::SkipEmptyParts);
#else
auto parts = QDir::toNativeSeparators(info.path()).split(QDir::separator(), Qt::SkipEmptyParts);
#endif
int numParts = QDir::toNativeSeparators(info.path()).split(QDir::separator(), Qt::SkipEmptyParts).length();
int numParts = parts.length();
numParts -= parts.count(".");
numParts -= parts.count("..") * 2;
@ -606,7 +611,12 @@ QString PathTruncate(const QString& path, int depth)
return PathTruncate(trunc, depth);
}
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
auto parts = QDir::toNativeSeparators(trunc).split(QDir::separator(), QString::SkipEmptyParts);
#else
auto parts = QDir::toNativeSeparators(trunc).split(QDir::separator(), Qt::SkipEmptyParts);
#endif
if (parts.startsWith(".") && !path.startsWith(".")) {
parts.removeFirst();
}