From 359a7d1b795a955a2fe4207389e4b6fc98b43184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Fri, 13 Jan 2023 16:51:59 +0100 Subject: [PATCH] Fortune* Example: Bump QDataStream format version One of the examples were using a different version than the others. Though QString's formatting probably didn't change since then so it was no problem. Anyway, pretend like we're releasing it now for the first time and set 6.5 on all of them Task-number: QTBUG-108875 Change-Id: I28b496ab3d8ff54c503a032ba15882cdf3d5eccf Reviewed-by: Friedemann Kleint (cherry picked from commit 71cd3bc074b4eea3158ba037ae2fe1c5b922ff3d) Reviewed-by: Qt Cherry-pick Bot --- examples/network/blockingfortuneclient/fortunethread.cpp | 2 +- examples/network/fortuneclient/client.cpp | 2 +- examples/network/fortuneserver/server.cpp | 2 +- examples/network/threadedfortuneserver/fortunethread.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/network/blockingfortuneclient/fortunethread.cpp b/examples/network/blockingfortuneclient/fortunethread.cpp index 8e8df8cf8e4..464482e17b8 100644 --- a/examples/network/blockingfortuneclient/fortunethread.cpp +++ b/examples/network/blockingfortuneclient/fortunethread.cpp @@ -62,7 +62,7 @@ void FortuneThread::run() //! [8] //! [11] QDataStream in(&socket); - in.setVersion(QDataStream::Qt_4_0); + in.setVersion(QDataStream::Qt_6_5); QString fortune; //! [11] //! [12] diff --git a/examples/network/fortuneclient/client.cpp b/examples/network/fortuneclient/client.cpp index e6169ce88c9..af7efbd9ed7 100644 --- a/examples/network/fortuneclient/client.cpp +++ b/examples/network/fortuneclient/client.cpp @@ -60,7 +60,7 @@ Client::Client(QWidget *parent) //! [1] in.setDevice(tcpSocket); - in.setVersion(QDataStream::Qt_4_0); + in.setVersion(QDataStream::Qt_6_5); //! [1] connect(hostCombo, &QComboBox::editTextChanged, diff --git a/examples/network/fortuneserver/server.cpp b/examples/network/fortuneserver/server.cpp index 5bf7a48e290..67d6117566b 100644 --- a/examples/network/fortuneserver/server.cpp +++ b/examples/network/fortuneserver/server.cpp @@ -94,7 +94,7 @@ void Server::sendFortune() //! [5] QByteArray block; QDataStream out(&block, QIODevice::WriteOnly); - out.setVersion(QDataStream::Qt_5_10); + out.setVersion(QDataStream::Qt_6_5); out << fortunes[QRandomGenerator::global()->bounded(fortunes.size())]; //! [4] //! [7] diff --git a/examples/network/threadedfortuneserver/fortunethread.cpp b/examples/network/threadedfortuneserver/fortunethread.cpp index 27050e17bd6..8bef57599e9 100644 --- a/examples/network/threadedfortuneserver/fortunethread.cpp +++ b/examples/network/threadedfortuneserver/fortunethread.cpp @@ -25,7 +25,7 @@ void FortuneThread::run() QByteArray block; QDataStream out(&block, QIODevice::WriteOnly); - out.setVersion(QDataStream::Qt_4_0); + out.setVersion(QDataStream::Qt_6_5); out << text; //! [3] //! [4]