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

RemoteLinux: Reuse StringUtils::joinStrings()

Browse Source 
Change-Id: I5be99df99a4b3952374b9f3b719d032d897b691c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Jarek Kobus
2023-02-03 11:54:23 +01:00
parent 5d96c3a4e9
commit 0d0ce383be
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -640,11 +640,8 @@ void LinuxProcessInterface::handleDone(const ProcessResultData &resultData)
ProcessResultData finalData = resultData; ProcessResultData finalData = resultData;
if (!m_pidParsed) { if (!m_pidParsed) {
finalData.m_error = QProcess::FailedToStart; finalData.m_error = QProcess::FailedToStart;
if (!m_error.isEmpty()) { finalData.m_errorString = Utils::joinStrings({finalData.m_errorString,
if (!finalData.m_errorString.isEmpty()) QString::fromLocal8Bit(m_error)}, '\n');
finalData.m_errorString += "\n";
finalData.m_errorString += QString::fromLocal8Bit(m_error);
}
} }
emit done(finalData); emit done(finalData);
} }