diff options
author | Christian Kandeler <[email protected]> | 2019-05-21 16:59:29 +0200 |
---|---|---|
committer | Christian Kandeler <[email protected]> | 2019-05-24 09:08:49 +0000 |
commit | 0a555018d1dda0aafff358774af2b564483a8c1e (patch) | |
tree | 657403526e058ab335f19b28e7283a86b2ac0810 /src/plugins/remotelinux/remotelinuxpackageinstaller.cpp | |
parent | be0d7aa3e94969234ebf4ba1ae552e973e7b6588 (diff) |
SSH: Pass remote command as QString
The old implementation sent the command over the wire as-is, so we
declared it as a QByteArray and let the caller choose the encoding. This
doesn't make sense anymore, as the command is now passed to an external
process as a QString anyway.
Change-Id: Ib84bc0f871db2b45b93f71d924c4177cc28d3bb0
Reviewed-by: hjk <[email protected]>
Diffstat (limited to 'src/plugins/remotelinux/remotelinuxpackageinstaller.cpp')
-rw-r--r-- | src/plugins/remotelinux/remotelinuxpackageinstaller.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp b/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp index 4d3439931bb..bf27f6d03ea 100644 --- a/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp +++ b/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp @@ -76,7 +76,7 @@ void AbstractRemoteLinuxPackageInstaller::installPackage(const IDevice::ConstPtr QString cmdLine = installCommandLine(packageFilePath); if (removePackageFile) cmdLine += QLatin1String(" && (rm ") + packageFilePath + QLatin1String(" || :)"); - d->installer->run(cmdLine.toUtf8(), deviceConfig->sshParameters()); + d->installer->run(cmdLine, deviceConfig->sshParameters()); d->isRunning = true; } @@ -86,7 +86,7 @@ void AbstractRemoteLinuxPackageInstaller::cancelInstallation() if (!d->killProcess) d->killProcess = new SshRemoteProcessRunner(this); - d->killProcess->run(cancelInstallationCommandLine().toUtf8(), d->deviceConfig->sshParameters()); + d->killProcess->run(cancelInstallationCommandLine(), d->deviceConfig->sshParameters()); setFinished(); } |