diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-13 01:05:02 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-13 01:05:02 +0200 |
commit | 6b8f422c5e56b95aad298e1b984fb60fba1da282 (patch) | |
tree | 545dac994ef985cc91d92fa77da21581b6762c86 /src/corelib/io/qprocess.cpp | |
parent | d04982dc84d66bec92b4b3767538676cf925ef17 (diff) | |
parent | d9e66f63a95b24ce3a7d2a30ccaf4dcab85d55a0 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/corelib/global/qglobal.cpp
src/corelib/io/qsettings.cpp
src/corelib/itemmodels/qstringlistmodel.cpp
tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03
Diffstat (limited to 'src/corelib/io/qprocess.cpp')
-rw-r--r-- | src/corelib/io/qprocess.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index 914d4421d0..3a475c0267 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -1951,7 +1951,7 @@ void QProcess::setProcessState(ProcessState state) /*! This function is called in the child process context just before the - program is executed on Unix or OS X (i.e., after \c fork(), but before + program is executed on Unix or \macos (i.e., after \c fork(), but before \c execve()). Reimplement this function to do last minute initialization of the child process. Example: @@ -1962,7 +1962,7 @@ void QProcess::setProcessState(ProcessState state) execution, your workaround is to emit finished() and then call exit(). - \warning This function is called by QProcess on Unix and OS X + \warning This function is called by QProcess on Unix and \macos only. On Windows and QNX, it is not called. */ void QProcess::setupChildProcess() @@ -2362,7 +2362,7 @@ void QProcess::setArguments(const QStringList &arguments) On Windows, terminate() posts a WM_CLOSE message to all top-level windows of the process and then to the main thread of the process itself. On Unix - and OS X the \c SIGTERM signal is sent. + and \macos the \c SIGTERM signal is sent. Console applications on Windows that do not run an event loop, or whose event loop does not handle the WM_CLOSE message, can only be terminated by @@ -2379,7 +2379,7 @@ void QProcess::terminate() /*! Kills the current process, causing it to exit immediately. - On Windows, kill() uses TerminateProcess, and on Unix and OS X, the + On Windows, kill() uses TerminateProcess, and on Unix and \macos, the SIGKILL signal is sent to the process. \sa terminate() |