diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-10 13:39:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-10 13:39:05 (GMT) |
| commit | e6dedd0e1b3708de278f42bbcfffda5ffbe00da2 (patch) | |
| tree | b482b622bc5af19fa9419663b2b8de1634b5e1a2 /src/network/socket/qlocalsocket_p.h | |
| parent | df5b862b3a60f975c9a0cab0efe9247874baaa1a (diff) | |
| parent | 073d04f1c2c5dc7020469bfc92708dce634f4779 (diff) | |
| download | Qt-e6dedd0e1b3708de278f42bbcfffda5ffbe00da2.zip Qt-e6dedd0e1b3708de278f42bbcfffda5ffbe00da2.tar.gz Qt-e6dedd0e1b3708de278f42bbcfffda5ffbe00da2.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QLocalSocket: don't emit readChannelFinished() twice on Windows
QLocalSocket/Win: QLocalSocketPrivate::bytesAvailable renamed
QLocalSocket: fix reading from a socket after broken connection
QLocalServer: make many simultaneous connection attempts work on Windows
tst_QLocalSocket::threadedConnection autotest stabilized
tst_qlocalsocket: pro files of client / server examples fixed
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d8a9d09376a47b92ea49f1a078c392cbfdbc0ed6 )
Diffstat (limited to 'src/network/socket/qlocalsocket_p.h')
| -rw-r--r-- | src/network/socket/qlocalsocket_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/socket/qlocalsocket_p.h b/src/network/socket/qlocalsocket_p.h index 0f1c23c..57ca3c2 100644 --- a/src/network/socket/qlocalsocket_p.h +++ b/src/network/socket/qlocalsocket_p.h @@ -135,7 +135,7 @@ public: void _q_canWrite(); void _q_pipeClosed(); void _q_emitReadyRead(); - DWORD bytesAvailable(); + DWORD checkPipeState(); void startAsyncRead(); bool completeAsyncRead(); void checkReadyRead(); |