summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qprocess.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-04-05 14:22:45 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2016-04-05 14:22:45 +0200
commitf2856875843efce9a00e90dad05bde358ab82197 (patch)
tree93346c38504ce04f0bf02dfe4a21299feb1be8ed /src/corelib/io/qprocess.cpp
parenta7b04275082d065f392e7f18c54ea9b41507ae40 (diff)
parenta2970719c26c946fd6fea7d902aad6706a4ca6ea (diff)
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts: examples/corelib/ipc/ipc.pro src/plugins/platforms/xcb/qxcbbackingstore.cpp tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp Change-Id: Ia006e10ff1732fe78f90138c41f05b59b49486cf
Diffstat (limited to 'src/corelib/io/qprocess.cpp')
-rw-r--r--src/corelib/io/qprocess.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 90a7f67c48..8b794df6df 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -1183,17 +1183,6 @@ bool QProcessPrivate::_q_processDied()
if (crashed) {
exitStatus = QProcess::CrashExit;
setErrorAndEmit(QProcess::Crashed);
- } else {
-#ifdef QPROCESS_USE_SPAWN
- // if we're using posix_spawn, waitForStarted always succeeds.
- // POSIX documents that the sub-process launched by posix_spawn will exit with code
- // 127 if anything prevents the target program from starting.
- // http://pubs.opengroup.org/onlinepubs/009695399/functions/posix_spawn.html
- if (exitStatus == QProcess::NormalExit && exitCode == 127) {
- setError(QProcess::FailedToStart,
- QProcess::tr("Process failed to start (spawned process exited with code 127)"));
- }
-#endif
}
bool wasRunning = (processState == QProcess::Running);