feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

filepath: Fix windows driver letter handling in fromString()

Browse Source 
Change-Id: Ic66e468ed2161bc10136ab31dc29a7358e6d7397
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2022-07-26 09:36:13 +02:00
parent 1c34105dfc
commit b2f0f78bdc
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libs/utils/filepath.cpp
View File

@@ -1133,6 +1133,10 @@ FilePath FilePath::fromString(const QString &filepath)
return fn;
}
bool isWindowsDriveLetter(QChar ch) {
return (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z');
}
void FilePath::setFromString(const QString &filename)
{
#ifndef UTILS_FILEPATH_USE_REGEXP
@@ -1142,6 +1146,7 @@ void FilePath::setFromString(const QString &filename)
static const QString rootPath = QDir::rootPath();
const QChar slash('/');
const QChar colon(':');
const QStringView fileNameView(filename);
if (fileNameView.startsWith(rootPath, Qt::CaseInsensitive)) { // Absolute path ...
@@ -1157,11 +1162,16 @@ void FilePath::setFromString(const QString &filename)
m_host = withoutQtcDeviceRoot.mid(firstSlash + 1, secondSlash - firstSlash - 1)
.toString();
if (secondSlash != -1) {
const QStringView path = withoutQtcDeviceRoot.mid(secondSlash);
m_data = path.startsWith(slashDotSlash) ? path.mid(3).toString()
: path.toString();
} else {
m_data = slash;
QStringView path = withoutQtcDeviceRoot.mid(secondSlash);
path = path.startsWith(QLatin1String(slashDotSlash)) ? path.mid(3) : path;
if (path.size() >= 3) { // On Windows we want to remove the leading slash ...
if (path[0] == slash && path[2] == colon && isWindowsDriveLetter(path[1]))
path = path.mid(1);
}
m_data = path.toString();
return;
}
} else {
m_scheme.clear();