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

FilePath: only assert on relative paths passed to absolute(File)Path

Browse Source 
Change-Id: Id765f2e9ae3fdf17b1f16388caa5d09a17b87371
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2021-09-09 06:45:37 +02:00
parent 6a435a3be9
commit ea215d612d
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -839,6 +839,8 @@ FilePath FilePath::parentDir() const
FilePath FilePath::absolutePath() const FilePath FilePath::absolutePath() const
{ {
if (isAbsolutePath())
return parentDir();
QTC_ASSERT(!needsDevice(), return *this); QTC_ASSERT(!needsDevice(), return *this);
FilePath result = *this; FilePath result = *this;
result.m_data = QFileInfo(m_data).absolutePath(); result.m_data = QFileInfo(m_data).absolutePath();
@@ -847,6 +849,8 @@ FilePath FilePath::absolutePath() const
FilePath FilePath::absoluteFilePath() const FilePath FilePath::absoluteFilePath() const
{ {
if (isAbsolutePath())
return *this;
QTC_ASSERT(!needsDevice(), return *this); QTC_ASSERT(!needsDevice(), return *this);
FilePath result = *this; FilePath result = *this;
result.m_data = QFileInfo(m_data).absoluteFilePath(); result.m_data = QFileInfo(m_data).absoluteFilePath();