From 37a86061d8f0d84c1584c927292fbd89e5347ab3 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 3 Feb 2023 15:13:04 +0100 Subject: [PATCH] CMakePM: Adapt to change in FilePath Silences some soft asserts. Change-Id: I4e39b66983552d85650062a3e8748e91936e8174 Reviewed-by: Cristian Adam --- src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index d1cca77c0bf..b89f6471d1c 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -1241,8 +1241,8 @@ void CMakeBuildSystem::updateInitialCMakeExpandableVars() if (it != cm.cend()) { const QByteArray initialValue = initialConfig.expandedValueOf(kit(), var).toUtf8(); - const FilePath initialPath = FilePath::fromString(QString::fromUtf8(initialValue)); - const FilePath path = FilePath::fromString(QString::fromUtf8(it->value)); + const FilePath initialPath = FilePath::fromUserInput(QString::fromUtf8(initialValue)); + const FilePath path = FilePath::fromUserInput(QString::fromUtf8(it->value)); if (!initialValue.isEmpty() && !samePath(path, initialPath) && !path.exists()) { CMakeConfigItem item(*it); @@ -1267,11 +1267,11 @@ void CMakeBuildSystem::updateInitialCMakeExpandableVars() const QByteArrayList initialValueList = initialConfig.expandedValueOf(kit(), var).toUtf8().split(';'); for (const auto &initialValue: initialValueList) { - const FilePath initialPath = FilePath::fromString(QString::fromUtf8(initialValue)); + const FilePath initialPath = FilePath::fromUserInput(QString::fromUtf8(initialValue)); const bool pathIsContained = Utils::contains(it->value.split(';'), [samePath, initialPath](const QByteArray &p) { - return samePath(FilePath::fromString(QString::fromUtf8(p)), initialPath); + return samePath(FilePath::fromUserInput(QString::fromUtf8(p)), initialPath); }); if (!initialValue.isEmpty() && !pathIsContained) { CMakeConfigItem item(*it);