diff options
author | Jason Barron <jbarron@trolltech.com> | 2009-08-25 08:51:44 (GMT) |
---|---|---|
committer | Jason Barron <jbarron@trolltech.com> | 2009-08-25 08:51:44 (GMT) |
commit | 8cee5b06aa0ecde7ba0a53c8a46070af3691db1b (patch) | |
tree | 4cd7f5ffb8b31af78f095c40fa6021a0331fde3b /src/corelib/io/qprocess.cpp | |
parent | f729015e1f44065b1b1911b65ba3fddd35d5545b (diff) | |
parent | f049061a7b479c957240ec8e4fd91d1e9463b071 (diff) | |
download | Qt-8cee5b06aa0ecde7ba0a53c8a46070af3691db1b.zip Qt-8cee5b06aa0ecde7ba0a53c8a46070af3691db1b.tar.gz Qt-8cee5b06aa0ecde7ba0a53c8a46070af3691db1b.tar.bz2 |
Merge commit 'origin/master' into 4.6
Diffstat (limited to 'src/corelib/io/qprocess.cpp')
-rw-r--r-- | src/corelib/io/qprocess.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index 057492d..764304d 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -532,7 +532,7 @@ void QProcessPrivate::Channel::clear() \snippet doc/src/snippets/process/process.cpp 0 - \section1 Notes for Windows Users + \section1 Notes for Windows Users Some Windows commands (for example, \c dir) are not provided by separate applications, but by the command interpreter itself. @@ -2012,9 +2012,6 @@ void QProcess::terminate() On Windows, kill() uses TerminateProcess, and on Unix and Mac OS X, the SIGKILL signal is sent to the process. - \note Killing running processes from other processes will typically - cause a panic in Symbian due to platform security. - \sa terminate() */ void QProcess::kill() |