diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-08 17:15:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-08 17:15:55 +0200 |
| commit | 3e71810cf3153e4331fc075a73b6408adcf33654 (patch) | |
| tree | 9f5fbb7a5dc2a902b380dd69a222c0f2cd6eb760 /examples/corelib/ipc/localfortuneserver/server.cpp | |
| parent | 6feec9da93032d11a768802ac2187d9d4153b1ec (diff) | |
| parent | ebd1046323615f22192055a94438bf85fc360ca3 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/network/access/qhttpnetworkconnection.cpp
src/network/access/qhttpnetworkconnection_p.h
Change-Id: I11f8641ef482efa8cee1b79977d19cc3182814b4
Diffstat (limited to 'examples/corelib/ipc/localfortuneserver/server.cpp')
| -rw-r--r-- | examples/corelib/ipc/localfortuneserver/server.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/corelib/ipc/localfortuneserver/server.cpp b/examples/corelib/ipc/localfortuneserver/server.cpp index 753f629e6a..2eee4760be 100644 --- a/examples/corelib/ipc/localfortuneserver/server.cpp +++ b/examples/corelib/ipc/localfortuneserver/server.cpp @@ -106,10 +106,10 @@ void Server::sendFortune() QByteArray block; QDataStream out(&block, QIODevice::WriteOnly); out.setVersion(QDataStream::Qt_4_0); - out << (quint16)0; + out << (quint32)0; out << fortunes.at(qrand() % fortunes.size()); out.device()->seek(0); - out << (quint16)(block.size() - sizeof(quint16)); + out << (quint32)(block.size() - sizeof(quint32)); QLocalSocket *clientConnection = server->nextPendingConnection(); connect(clientConnection, SIGNAL(disconnected()), |