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

Utils: Also use device name when trying to disambiguate path displays

Browse Source 
With two /tmp/foo.cpp from different devices there is no directly
visible difference in the Open Documents. Adding the device path
for remote cases introduces a difference.

For local files there is no visible difference.

Change-Id: I6f1632d6f51ff24573831af3161492989c5c0bec
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2022-06-10 13:26:46 +02:00
parent 734035194b
commit bf8bf1adc0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -527,10 +527,11 @@ QString FilePath::fileNameWithPathComponents(int pathComponents) const
; ;
} }
// If there are no more slashes before the found one, return the entire string
if (i > 0 && m_data.lastIndexOf(slash, i) != -1) if (i > 0 && m_data.lastIndexOf(slash, i) != -1)
return m_data.mid(component); return m_data.mid(component);
return m_data;
// If there are no more slashes before the found one, return the entire string
return displayName();
} }
/// \returns the base name of the file without the path. /// \returns the base name of the file without the path.