summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2021-02-18 14:53:50 -0800
committerThiago Macieira <thiago.macieira@intel.com>2021-02-21 22:48:38 -0800
commitd012e953bfb498091c0ea9a83a717a3deffc670f (patch)
tree01352c2af0b5f54453330e4934f494328839c51f
parent5d977b0fd2fa4611571e50378647c09febd49141 (diff)
QProcess/Unix: remove outdated notices about use of posix_spawn() on QNX
We haven't used the spawn functionality on QNX since Qt 5.7 (commit 005a8bfbf0022f03dafafcf2b5c438ccf0675a49) because that's when we dropped support for QNX 6.5.0. Change-Id: Ic90d8429a0eb4837971dfffd1664f9712bdce2d8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
-rw-r--r--src/corelib/io/qprocess_unix.cpp4
-rw-r--r--tests/auto/corelib/io/qprocess/tst_qprocess.cpp3
2 files changed, 0 insertions, 7 deletions
diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp
index bd795af9ec..5529161e8d 100644
--- a/src/corelib/io/qprocess_unix.cpp
+++ b/src/corelib/io/qprocess_unix.cpp
@@ -504,10 +504,6 @@ void QProcessPrivate::startProcess()
delete [] envp;
}
- // On QNX, if spawnChild failed, childPid will be -1 but forkfd is still 0.
- // This is intentional because we only want to handle failure to fork()
- // here, which is a rare occurrence. Handling of the failure to start is
- // done elsewhere.
if (forkfd == -1) {
// Cleanup, report error and return
#if defined (QPROCESS_DEBUG)
diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
index 41c4315c2a..857c24c571 100644
--- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
+++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
@@ -2260,9 +2260,6 @@ void tst_QProcess::setNonExistentWorkingDirectory()
QCOMPARE(int(process.error()), int(QProcess::FailedToStart));
#ifdef Q_OS_UNIX
-# ifdef QPROCESS_USE_SPAWN
- QEXPECT_FAIL("", "QProcess cannot detect failure to start when using posix_spawn()", Continue);
-# endif
QVERIFY2(process.errorString().startsWith("chdir:"), process.errorString().toLocal8Bit());
#endif
}