diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-04 08:59:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-04 08:59:18 +0200 |
| commit | 216f57ef8682f74b72ae4e39cf1fd23abddf6a51 (patch) | |
| tree | 9d1dc12e0944ec0252dac843fbadaf1dc4693888 /src/corelib/io | |
| parent | 36bc2477753d19a14c587b97d4ec4f263e9e16c0 (diff) | |
| parent | 8ce657d0279566ef327af1b88339534041ddc012 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I35ca979395620e104e50b06366d0869433a4ffc2
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qprocess_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp index 93807e13eb..a5b7692fc9 100644 --- a/src/corelib/io/qprocess_unix.cpp +++ b/src/corelib/io/qprocess_unix.cpp @@ -701,7 +701,7 @@ qint64 QProcessPrivate::writeToStdin(const char *data, qint64 maxlen) void QProcessPrivate::terminateProcess() { #if defined (QPROCESS_DEBUG) - qDebug("QProcessPrivate::killProcess()"); + qDebug("QProcessPrivate::terminateProcess()"); #endif if (pid) ::kill(pid_t(pid), SIGTERM); |