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

Various: Adapt to change in FilePath

Browse Source 
Change-Id: I9218b7378ffb8662338351a551f5809914f18a62
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2023-01-16 15:01:12 +01:00
parent 7b74432fb1
commit daf0e062e1
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/aspects.cpp
View File

@@ -1230,7 +1230,7 @@ void StringAspect::update()
const QString displayedString = d->m_displayFilter ? d->m_displayFilter(value()) : value(); const QString displayedString = d->m_displayFilter ? d->m_displayFilter(value()) : value();
if (d->m_pathChooserDisplay) { 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()); d->updateWidgetFromCheckStatus(this, d->m_pathChooserDisplay.data());
} }

2
src/plugins/clangtools/executableinfo.cpp
View File

@@ -219,7 +219,7 @@ static QPair<FilePath, QString> clangIncludeDirAndVersion(const FilePath &clangT
const FilePath dynamicResourceDir = queryResourceDir(clangToolPath); const FilePath dynamicResourceDir = queryResourceDir(clangToolPath);
const QString dynamicVersion = queryVersion(clangToolPath, QueryFailMode::Noisy); const QString dynamicVersion = queryVersion(clangToolPath, QueryFailMode::Noisy);
if (dynamicResourceDir.isEmpty() || dynamicVersion.isEmpty()) 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}; return {dynamicResourceDir / "include", dynamicVersion};
} }

2
src/plugins/squish/squishplugin.cpp
View File

@@ -120,7 +120,7 @@ bool SquishPluginPrivate::initializeGlobalScripts()
// FIXME? comma, special characters in paths // FIXME? comma, special characters in paths
const Utils::FilePaths globalDirs = Utils::transform( 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); SquishFileHandler::instance()->setSharedFolders(globalDirs);
}); });
return true; return true;

2
src/plugins/squish/squishsettings.cpp
View File

@@ -46,7 +46,7 @@ SquishSettings::SquishSettings()
QTC_ASSERT(edit, return false); QTC_ASSERT(edit, return false);
if (!squishPath.pathChooser()->defaultValidationFunction()(edit, error)) if (!squishPath.pathChooser()->defaultValidationFunction()(edit, error))
return false; return false;
const FilePath squishServer = FilePath::fromString(edit->text()) const FilePath squishServer = FilePath::fromUserInput(edit->text())
.pathAppended(HostOsInfo::withExecutableSuffix("bin/squishserver")); .pathAppended(HostOsInfo::withExecutableSuffix("bin/squishserver"));
const bool valid = squishServer.isExecutableFile(); const bool valid = squishServer.isExecutableFile();
if (!valid && error) if (!valid && error)

2
src/plugins/squish/squishtools.cpp
View File

@@ -976,7 +976,7 @@ Utils::Links SquishTools::setBreakpoints()
for (const GlobalBreakpoint &gb : globalBPs) { for (const GlobalBreakpoint &gb : globalBPs) {
if (!gb->isEnabled()) if (!gb->isEnabled())
continue; continue;
const Utils::FilePath filePath = Utils::FilePath::fromString( const Utils::FilePath filePath = Utils::FilePath::fromUserInput(
gb->data(BreakpointFileColumn, Qt::DisplayRole).toString()); gb->data(BreakpointFileColumn, Qt::DisplayRole).toString());
auto fileName = filePath.canonicalPath().toUserOutput(); auto fileName = filePath.canonicalPath().toUserOutput();
if (fileName.isEmpty()) if (fileName.isEmpty())