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/libs/utils/consoleprocess_unix.cpp | |
| parent | d504277901279d8b01efe1da8b21fc0ec9290c9c (diff) | |
| parent | b02f4ae6154810a9894615eca3052957e6e3ec56 (diff) | |
| download | qt-creator-917636b88b2b8b4a7e3d945671b978504df5bc3f.tar.gz | |
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/libs/utils/consoleprocess_unix.cpp')
| -rw-r--r-- | src/libs/utils/consoleprocess_unix.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp index 6b02f92c24..fe83b95f58 100644 --- a/src/libs/utils/consoleprocess_unix.cpp +++ b/src/libs/utils/consoleprocess_unix.cpp @@ -80,8 +80,12 @@ bool ConsoleProcess::start() QtcProcess::SplitError perr; QtcProcess::Arguments pargs = QtcProcess::prepareArgs(d->m_commandLine.arguments(), - &perr, HostOsInfo::hostOs(), - &d->m_environment, &d->m_workingDir); + &perr, + HostOsInfo::hostOs(), + &d->m_environment, + &d->m_workingDir, + d->m_commandLine.metaCharMode() + == CommandLine::MetaCharMode::Abort); QString pcmd; if (perr == QtcProcess::SplitOk) { pcmd = d->m_commandLine.executable().toString(); |