From ea215d612d86cf5b6b5b4ec3719e38c2174c4cfd Mon Sep 17 00:00:00 2001 From: David Schulz Date: Thu, 9 Sep 2021 06:45:37 +0200 Subject: [PATCH] FilePath: only assert on relative paths passed to absolute(File)Path Change-Id: Id765f2e9ae3fdf17b1f16388caa5d09a17b87371 Reviewed-by: hjk --- src/libs/utils/filepath.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp index 0767542066e..dcc5c6fac6a 100644 --- a/src/libs/utils/filepath.cpp +++ b/src/libs/utils/filepath.cpp @@ -839,6 +839,8 @@ FilePath FilePath::parentDir() const FilePath FilePath::absolutePath() const { + if (isAbsolutePath()) + return parentDir(); QTC_ASSERT(!needsDevice(), return *this); FilePath result = *this; result.m_data = QFileInfo(m_data).absolutePath(); @@ -847,6 +849,8 @@ FilePath FilePath::absolutePath() const FilePath FilePath::absoluteFilePath() const { + if (isAbsolutePath()) + return *this; QTC_ASSERT(!needsDevice(), return *this); FilePath result = *this; result.m_data = QFileInfo(m_data).absoluteFilePath();