diff options
| author | Alex Trotsenko <alex1973tr@gmail.com> | 2020-12-28 19:43:52 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2020-12-31 12:16:38 +0000 |
| commit | 04c34eb7992c88a84b04928985c231c44694ae8f (patch) | |
| tree | 3906aa6b84a281787ac6ad081c92c69d8b2e3c05 /src/corelib/io/qprocess_win.cpp | |
| parent | 1fb9c5348e3f7d4dd80e5b924aaca93632c651f9 (diff) | |
QProcess: allow merged channels forwarding for detached processes
[ChangeLog][QtCore][QProcess] Added support for QProcess::MergedChannels
mode with startDetached().
Change-Id: I953ad2063322015332269522a297f8e2842e438c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Diffstat (limited to 'src/corelib/io/qprocess_win.cpp')
| -rw-r--r-- | src/corelib/io/qprocess_win.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp index c9223443e2..0ed1f3f428 100644 --- a/src/corelib/io/qprocess_win.cpp +++ b/src/corelib/io/qprocess_win.cpp @@ -914,17 +914,7 @@ bool QProcessPrivate::startDetached(qint64 *pid) DWORD dwCreationFlags = (GetConsoleWindow() ? 0 : CREATE_NO_WINDOW); dwCreationFlags |= CREATE_UNICODE_ENVIRONMENT; - STARTUPINFOW startupInfo = { sizeof( STARTUPINFO ), 0, 0, 0, - (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT, - (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT, - 0, 0, 0, - STARTF_USESTDHANDLES, - 0, 0, 0, - pipeOrStdHandle(stdinChannel.pipe[0], STD_INPUT_HANDLE), - pipeOrStdHandle(stdoutChannel.pipe[1], STD_OUTPUT_HANDLE), - pipeOrStdHandle(stderrChannel.pipe[1], STD_ERROR_HANDLE) - }; - + STARTUPINFOW startupInfo = createStartupInfo(); QProcess::CreateProcessArguments cpargs = { nullptr, reinterpret_cast<wchar_t *>(const_cast<ushort *>(args.utf16())), nullptr, nullptr, true, dwCreationFlags, envPtr, |