diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp index ba45a66f8c3..36831b5ba59 100644 --- a/src/libs/utils/aspects.cpp +++ b/src/libs/utils/aspects.cpp @@ -1230,7 +1230,7 @@ void StringAspect::update() const QString displayedString = d->m_displayFilter ? d->m_displayFilter(value()) : value(); if (d->m_pathChooserDisplay) { - d->m_pathChooserDisplay->setFilePath(FilePath::fromString(displayedString)); + d->m_pathChooserDisplay->setFilePath(FilePath::fromUserInput(displayedString)); d->updateWidgetFromCheckStatus(this, d->m_pathChooserDisplay.data()); } diff --git a/src/plugins/clangtools/executableinfo.cpp b/src/plugins/clangtools/executableinfo.cpp index ffdd635b5f1..643b7afe00c 100644 --- a/src/plugins/clangtools/executableinfo.cpp +++ b/src/plugins/clangtools/executableinfo.cpp @@ -219,7 +219,7 @@ static QPair clangIncludeDirAndVersion(const FilePath &clangT const FilePath dynamicResourceDir = queryResourceDir(clangToolPath); const QString dynamicVersion = queryVersion(clangToolPath, QueryFailMode::Noisy); if (dynamicResourceDir.isEmpty() || dynamicVersion.isEmpty()) - return {FilePath::fromString(CLANG_INCLUDE_DIR), QString(CLANG_VERSION)}; + return {FilePath::fromUserInput(CLANG_INCLUDE_DIR), QString(CLANG_VERSION)}; return {dynamicResourceDir / "include", dynamicVersion}; } diff --git a/src/plugins/squish/squishplugin.cpp b/src/plugins/squish/squishplugin.cpp index 897c4beadae..fe9d9f1d13d 100644 --- a/src/plugins/squish/squishplugin.cpp +++ b/src/plugins/squish/squishplugin.cpp @@ -120,7 +120,7 @@ bool SquishPluginPrivate::initializeGlobalScripts() // FIXME? comma, special characters in paths const Utils::FilePaths globalDirs = Utils::transform( - output.trimmed().split(',', Qt::SkipEmptyParts), &Utils::FilePath::fromString); + output.trimmed().split(',', Qt::SkipEmptyParts), &Utils::FilePath::fromUserInput); SquishFileHandler::instance()->setSharedFolders(globalDirs); }); return true; diff --git a/src/plugins/squish/squishsettings.cpp b/src/plugins/squish/squishsettings.cpp index ebfd0c131b8..0a9e9503c11 100644 --- a/src/plugins/squish/squishsettings.cpp +++ b/src/plugins/squish/squishsettings.cpp @@ -46,7 +46,7 @@ SquishSettings::SquishSettings() QTC_ASSERT(edit, return false); if (!squishPath.pathChooser()->defaultValidationFunction()(edit, error)) return false; - const FilePath squishServer = FilePath::fromString(edit->text()) + const FilePath squishServer = FilePath::fromUserInput(edit->text()) .pathAppended(HostOsInfo::withExecutableSuffix("bin/squishserver")); const bool valid = squishServer.isExecutableFile(); if (!valid && error) diff --git a/src/plugins/squish/squishtools.cpp b/src/plugins/squish/squishtools.cpp index a812392a94e..2556e4c7df5 100644 --- a/src/plugins/squish/squishtools.cpp +++ b/src/plugins/squish/squishtools.cpp @@ -976,7 +976,7 @@ Utils::Links SquishTools::setBreakpoints() for (const GlobalBreakpoint &gb : globalBPs) { if (!gb->isEnabled()) continue; - const Utils::FilePath filePath = Utils::FilePath::fromString( + const Utils::FilePath filePath = Utils::FilePath::fromUserInput( gb->data(BreakpointFileColumn, Qt::DisplayRole).toString()); auto fileName = filePath.canonicalPath().toUserOutput(); if (fileName.isEmpty())