diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-06-18 12:30:00 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-06-18 12:30:55 +0200 |
| commit | 917636b88b2b8b4a7e3d945671b978504df5bc3f (patch) | |
| tree | e0e13633c5e281ddd6c6a6bd67c190a0331532b0 /src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp | |
| parent | d504277901279d8b01efe1da8b21fc0ec9290c9c (diff) | |
| parent | b02f4ae6154810a9894615eca3052957e6e3ec56 (diff) | |
Merge remote-tracking branch 'origin/4.10'
Conflicts:
src/libs/utils/consoleprocess.h
src/libs/utils/consoleprocess_unix.cpp
src/libs/utils/consoleprocess_win.cpp
src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
src/tools/clangrefactoringbackend/source/symbolscollector.cpp
tests/unit/mockup/projectexplorer/project.h
Change-Id: I8d10f26b9bcb54829ba31cdc2272885691df1e16
Diffstat (limited to 'src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp index a4b0857820..bab6ca6adc 100644 --- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp +++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp @@ -201,7 +201,9 @@ void SshDeviceProcess::handleConnected() this, &SshDeviceProcess::handleProcessStarted); connect(&d->consoleProcess, &ConsoleProcess::stubStopped, this, [this] { handleProcessFinished(d->consoleProcess.errorString()); }); - d->consoleProcess.setCommand({FilePath::fromString(cmdLine.first()), cmdLine.mid(1)}); + d->consoleProcess.setCommand({FilePath::fromString(cmdLine.first()), + cmdLine.mid(1), + CommandLine::MetaCharMode::Ignore}); d->consoleProcess.start(); } else { connect(d->process.get(), &QSsh::SshRemoteProcess::started, |