diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-16 08:07:08 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-02-16 22:31:50 +0000 |
commit | 048d8dee52545a9b0a548b4c56958a75a99d9aee (patch) | |
tree | c549685860a49e71809e06e90cc0fa6031a2def1 /src/corelib/io/qprocess_win.cpp | |
parent | 6ffb358822db2e0d30fb34853c3222cd866d57c5 (diff) | |
parent | 942ab490724fcc9544e786e5783718e1a07aa50b (diff) |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/io/qprocess_win.cpp')
-rw-r--r-- | src/corelib/io/qprocess_win.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp index 6ab806d9fe..3a62a67e3b 100644 --- a/src/corelib/io/qprocess_win.cpp +++ b/src/corelib/io/qprocess_win.cpp @@ -101,7 +101,8 @@ static void qt_create_pipe(Q_PIPE *pipe, bool isInputPipe) unsigned int attempts = 1000; forever { _snwprintf(pipeName, sizeof(pipeName) / sizeof(pipeName[0]), - L"\\\\.\\pipe\\qt-%X", QRandomGenerator::global()->generate()); + L"\\\\.\\pipe\\qt-%lX-%X", long(QCoreApplication::applicationPid()), + QRandomGenerator::global()->generate()); DWORD dwOpenMode = FILE_FLAG_OVERLAPPED; DWORD dwOutputBufferSize = 0; |