diff options
| author |   Andreas Eliasson <andreas.eliasson@qt.io> | 2022-11-28 12:12:47 +0100 |
|---|---|---|
| committer |   Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-11-30 13:49:08 +0000 |
| commit | e97cc54f70094f8679ce3250b5019a3b295f1e27 (patch) | |
| tree | e53569bbf0f4d85e33f3903644e317bd70b39738 | |
| parent | Blacklist tst_QWidgetRepainManager functions flaking on XCB (diff) | |
| download | qtbase-e97cc54f70094f8679ce3250b5019a3b295f1e27.tar.xz qtbase-e97cc54f70094f8679ce3250b5019a3b295f1e27.zip | |
Doc: Fix typo and mismatch between code and description
Fixes: QTBUG-107675
Change-Id: I38140617a2b0525db417137aa41a52a389b3bea3
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit de7287be69b449b1da13148e62fbeef0406eb792)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | examples/network/doc/src/blockingfortuneclient.qdoc | 2 | ||||
| -rw-r--r-- | examples/network/doc/src/fortuneserver.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/network/doc/src/blockingfortuneclient.qdoc b/examples/network/doc/src/blockingfortuneclient.qdoc index 931391567d..37c96f6178 100644 --- a/examples/network/doc/src/blockingfortuneclient.qdoc +++ b/examples/network/doc/src/blockingfortuneclient.qdoc @@ -123,7 +123,7 @@ The final part of our loop is that we acquire the mutex so that we can safely read from our member data. We then let the thread go to sleep by calling QWaitCondition::wait(). At this point, we can go back to - requestNewFortune() and look closed at the call to wakeOne(): + requestNewFortune() and look closely at the call to wakeOne(): \snippet blockingfortuneclient/fortunethread.cpp 1 \dots diff --git a/examples/network/doc/src/fortuneserver.qdoc b/examples/network/doc/src/fortuneserver.qdoc index a24804ffda..0ef221bd61 100644 --- a/examples/network/doc/src/fortuneserver.qdoc +++ b/examples/network/doc/src/fortuneserver.qdoc @@ -48,7 +48,7 @@ to the connecting socket. This is a common way to transfer binary data using QTcpSocket. First we create a QByteArray and a QDataStream object, passing the bytearray to QDataStream's constructor. We then explicitly set - the protocol version of QDataStream to QDataStream::Qt_4_0 to ensure that + the protocol version of QDataStream to QDataStream::Qt_5_10 to ensure that we can communicate with clients from future versions of Qt (see QDataStream::setVersion()). We continue by streaming in a random fortune. |