qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation on 64-bit CPUs when QPROCESS_DEBUG is enabled 

Change-Id: Iad4bea50805b59bd6e985f5830315a7437880b99
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Alex Trotsenko <alex1973tr@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
David Faure 2017-08-10 22:44:38 +02:00
parent 4e3917587b
commit 2282ca44e4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/io/qprocess.cpp
View File

@ -1029,7 +1029,8 @@ bool QProcessPrivate::tryReadFromChannel(Channel *channel)
if (readBytes == -1) {
setErrorAndEmit(QProcess::ReadError);
#if defined QPROCESS_DEBUG
qDebug("QProcessPrivate::tryReadFromChannel(%d), failed to read from the process", channel - &stdinChannel);
qDebug("QProcessPrivate::tryReadFromChannel(%d), failed to read from the process",
int(channel - &stdinChannel));
#endif
return false;
}
@ -1039,13 +1040,14 @@ bool QProcessPrivate::tryReadFromChannel(Channel *channel)
channel->notifier->setEnabled(false);
closeChannel(channel);
#if defined QPROCESS_DEBUG
qDebug("QProcessPrivate::tryReadFromChannel(%d), 0 bytes available", channel - &stdinChannel);
qDebug("QProcessPrivate::tryReadFromChannel(%d), 0 bytes available",
int(channel - &stdinChannel));
#endif
return false;
}
#if defined QPROCESS_DEBUG
qDebug("QProcessPrivate::tryReadFromChannel(%d), read %d bytes from the process' output", channel - &stdinChannel
int(readBytes));
qDebug("QProcessPrivate::tryReadFromChannel(%d), read %d bytes from the process' output",
int(channel - &stdinChannel), int(readBytes));
#endif
if (channel->closed) {