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

Merge remote-tracking branch 'origin/5.0'

Browse Source 
Change-Id: I370268624bd6e91e7b44fa236e913f5f55867e17
This commit is contained in:
Eike Ziller
2021-08-20 09:50:30 +02:00
parent 4ec490e77e c568ab89c5
commit b09b6bd747
28 changed files with 174 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1196,9 +1196,24 @@ FilePath FilePath::pathAppended(const QString &path) const
FilePath fn = *this;
if (path.isEmpty())
return fn;
if (!fn.m_data.isEmpty() && !fn.m_data.endsWith(QLatin1Char('/')))
fn.m_data.append('/');
fn.m_data.append(path);
if (fn.m_data.isEmpty()) {
fn.m_data = path;
return fn;
}
if (fn.m_data.endsWith('/')) {
if (path.startsWith('/'))
fn.m_data.append(path.mid(1));
else
fn.m_data.append(path);
} else {
if (path.startsWith('/'))
fn.m_data.append(path);
else
fn.m_data.append('/').append(path);
}
return fn;
}