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

RemoteLinux: Avoid two explicit uses of IDevice::mapToGlobalPath()

Browse Source 
Change-Id: I5e1e3f3de1118234dcaf1faa5690662876e85b4c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2022-05-10 15:45:34 +02:00
parent e2df7b7f6b
commit dfe0776002
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/remotelinux/linuxdevice.cpp
View File

@@ -1027,7 +1027,7 @@ LinuxDevice::LinuxDevice()
d->m_terminals.removeOne(proc); d->m_terminals.removeOne(proc);
}); });
proc->setCommand({ mapToGlobalPath({}), {}}); proc->setCommand({filePath({}), {}});
proc->setTerminalMode(TerminalMode::On); proc->setTerminalMode(TerminalMode::On);
proc->setEnvironment(env); proc->setEnvironment(env);
proc->setWorkingDirectory(workingDir); proc->setWorkingDirectory(workingDir);

3
src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp
View File

@@ -81,8 +81,7 @@ void RemoteLinuxCheckForFreeDiskSpaceService::setRequiredSpaceInBytes(quint64 si
void RemoteLinuxCheckForFreeDiskSpaceService::deployAndFinish() void RemoteLinuxCheckForFreeDiskSpaceService::deployAndFinish()
{ {
auto cleanup = qScopeGuard([this] { setFinished(); }); auto cleanup = qScopeGuard([this] { setFinished(); });
const FilePath path const FilePath path = deviceConfiguration()->filePath(m_pathToCheck);
= deviceConfiguration()->mapToGlobalPath(FilePath::fromString(m_pathToCheck));
const qint64 freeSpace = path.bytesAvailable(); const qint64 freeSpace = path.bytesAvailable();
if (freeSpace < 0) { if (freeSpace < 0) {
emit errorMessage(tr("Cannot get info about free disk space for \"%1\"") emit errorMessage(tr("Cannot get info about free disk space for \"%1\"")