Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bug with baseQDir in PathUtils.cpp #5689

Merged
merged 4 commits into from
Sep 30, 2020
Merged

Fix bug with baseQDir in PathUtils.cpp #5689

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
045da1c
Fix bug with baseQDir in PathUtils.cpp
Spekular Sep 27, 2020
c93fb1a
Update PathUtil.cpp
Spekular Sep 28, 2020
e705d8f
Update src/core/PathUtil.cpp
Spekular Sep 29, 2020
603c380
Update PathUtil.cpp
Spekular Sep 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/core/PathUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ namespace PathUtil
return QDir::cleanPath(loc) + "/";
}

QDir baseQDir (const Base base) { return QDir(baseLocation(base)); }
QDir baseQDir (const Base base)
{
if (base == Base::Absolute) { return QDir::root(); }
return QDir(baseLocation(base));
}

QString basePrefix(const Base base)
{
Expand Down Expand Up @@ -123,6 +127,7 @@ namespace PathUtil
{
if (input.isEmpty()) { return input; }
QString absolutePath = toAbsolute(input);
if (base == Base::Absolute) { return absolutePath; }
QString relativePath = baseQDir(base).relativeFilePath(absolutePath);
return relativePath.startsWith("..") ? absolutePath : relativePath;
}
Expand Down