diff options
| author | Rafael Roquetto <rafael.roquetto@kdab.com> | 2012-02-14 23:14:14 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-20 21:48:14 +0100 |
| commit | ae39f2286b6fb5ddc63223bab4b3fab3736b4ee8 (patch) | |
| tree | abc020a85afd24deb7e0c5577c0b3b483d2e0a4e /src/corelib/io/qprocess_p.h | |
| parent | 0570a0f3936a2f7d7ec5afef9fcea8193ef3c15c (diff) | |
Fixes QProcess on QNX
This patch first re-enables childStartedPipe on QNX and uses, just like other
platforms, to monitor the inferior process life cycle. This also aligns
QNX-specific code logic closer to the common QProcess logic, making it
unecessary to have custom versions of functions such as
QProcess::waitForStarted(). The only difference that remains is the use of
spawn() instead of fork(), because both fork() and vfork() do not support
multi-threaded applications on QNX and will segfault.
Change-Id: I8e1f9823629fcb5e7c3c128fafc2542a403b969e
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qprocess_p.h')
| -rw-r--r-- | src/corelib/io/qprocess_p.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h index 81ba9bc0cb..6eeeeada78 100644 --- a/src/corelib/io/qprocess_p.h +++ b/src/corelib/io/qprocess_p.h @@ -288,15 +288,11 @@ public: QRingBuffer errorReadBuffer; QRingBuffer writeBuffer; -#ifndef Q_OS_QNX Q_PIPE childStartedPipe[2]; -#endif Q_PIPE deathPipe[2]; void destroyPipe(Q_PIPE pipe[2]); -#ifndef Q_OS_QNX QSocketNotifier *startupSocketNotifier; -#endif QSocketNotifier *deathNotifier; // the wonderful windows notifier |