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

McuSupport: FilePath::fromString -> fromUserInput changes

Browse Source 
Prevent non-portable dir delimiters from getting into a FilePath.

Change-Id: I78e4a98e03ffe95e3cef70c9c499af28fa33c25c
Reviewed-by: <christiaan.janssen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Alessandro Portale
2021-09-27 22:12:34 +02:00
parent ef545260cd
commit f88c885d44
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/mcusupport/mcusupportoptions.cpp
View File

@@ -1305,7 +1305,8 @@ Tasks McuDependenciesKitAspect::validate(const Kit *k) const
if (!environment.hasKey(dependency.name)) { if (!environment.hasKey(dependency.name)) {
result << BuildSystemTask(Task::Warning, tr("Environment variable %1 not defined.").arg(dependency.name)); result << BuildSystemTask(Task::Warning, tr("Environment variable %1 not defined.").arg(dependency.name));
} else { } else {
const auto path = Utils::FilePath::fromString(environment.value(dependency.name) + "/" + dependency.value); const auto path = Utils::FilePath::fromUserInput(
environment.value(dependency.name) + "/" + dependency.value);
if (!path.exists()) { if (!path.exists()) {
result << BuildSystemTask(Task::Warning, tr("%1 not found.").arg(path.toUserOutput())); result << BuildSystemTask(Task::Warning, tr("%1 not found.").arg(path.toUserOutput()));
} }

7
src/plugins/mcusupport/mcusupportversiondetection.cpp
View File

@@ -62,14 +62,13 @@ QString McuPackageExecutableVersionDetector::parseVersion(const QString &package
if (m_detectionPath.isEmpty() || m_detectionRegExp.isEmpty()) if (m_detectionPath.isEmpty() || m_detectionRegExp.isEmpty())
return QString(); return QString();
QString binaryPath = QDir::toNativeSeparators(packagePath + "/" + m_detectionPath); const Utils::FilePath binaryPath = Utils::FilePath::fromString(packagePath) / m_detectionPath;
if (!Utils::FilePath::fromString(binaryPath).exists()) if (!binaryPath.exists())
return QString(); return QString();
const int execTimeout = 3000; // usually runs below 1s, but we want to be on the safe side const int execTimeout = 3000; // usually runs below 1s, but we want to be on the safe side
QProcess binaryProcess; QProcess binaryProcess;
binaryProcess.start(binaryPath, m_detectionArgs); binaryProcess.start(binaryPath.toString(), m_detectionArgs);
if (!binaryProcess.waitForStarted()) if (!binaryProcess.waitForStarted())
return QString(); return QString();
binaryProcess.waitForFinished(execTimeout); binaryProcess.waitForFinished(execTimeout);