diff options
Diffstat (limited to 'src/corelib/io/qprocess_p.h')
-rw-r--r-- | src/corelib/io/qprocess_p.h | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h index 35626ddc38..5654b404fe 100644 --- a/src/corelib/io/qprocess_p.h +++ b/src/corelib/io/qprocess_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -62,6 +62,9 @@ typedef HANDLE Q_PIPE; #else typedef int Q_PIPE; #define INVALID_Q_PIPE -1 +# ifdef Q_OS_QNX +# define QPROCESS_USE_SPAWN +# endif #endif #ifndef QT_NO_PROCESS @@ -98,7 +101,7 @@ public: QByteArray key; uint hash; }; -inline uint qHash(const QProcEnvKey &key) { return key.hash; } +inline uint qHash(const QProcEnvKey &key) Q_DECL_NOTHROW { return key.hash; } class QProcEnvValue { @@ -331,12 +334,13 @@ public: QProcessEnvironment environment; Q_PIPE childStartedPipe[2]; - Q_PIPE deathPipe[2]; void destroyPipe(Q_PIPE pipe[2]); QSocketNotifier *startupSocketNotifier; QSocketNotifier *deathNotifier; + int forkfd; + #ifdef Q_OS_WIN // the wonderful windows notifier QTimer *notifier; @@ -345,10 +349,10 @@ public: void start(QIODevice::OpenMode mode); void startProcess(); -#if defined(Q_OS_UNIX) && !defined(Q_OS_QNX) +#if defined(Q_OS_UNIX) && !defined(QPROCESS_USE_SPAWN) void execChild(const char *workingDirectory, char **path, char **argv, char **envp); -#elif defined(Q_OS_QNX) - pid_t spawnChild(const char *workingDirectory, char **argv, char **envp); +#elif defined(QPROCESS_USE_SPAWN) + pid_t spawnChild(pid_t *ppid, const char *workingDirectory, char **argv, char **envp); #endif bool processStarted(); void terminateProcess(); @@ -369,9 +373,6 @@ public: int exitCode; QProcess::ExitStatus exitStatus; bool crashed; -#ifdef Q_OS_UNIX - int serial; -#endif bool waitForStarted(int msecs = 30000); bool waitForReadyRead(int msecs = 30000); @@ -389,9 +390,6 @@ public: QList<QSocketNotifier *> defaultNotifiers() const; #endif // Q_OS_BLACKBERRY -#ifdef Q_OS_UNIX - static void initializeProcessManager(); -#endif }; QT_END_NAMESPACE |