Allow using the same remotecontroller for 5.15 benchmarkdemo

Note: It has to be compiled with Qt 5.15.x to be usable with
Qt 5.15.x version of the benchmarkdemo

BenchmarkDemoQt6/remotecontrolreceiver.cpp

@@ -4,7 +4,7 @@
 
 QString RemoteControlReceiver::startServer()
 {
-    m_incoming.setVersion(QDataStream::Qt_6_1);
+    m_incoming.setVersion(QDataStream::Qt_6_0);
 
     if (m_tcpServer)
         return QString();
@@ -112,13 +112,13 @@ void RemoteControlReceiver::sendReport(const QString &report)
     // Payload, i.e. test report
     QByteArray block;
     QDataStream out(&block, QIODevice::WriteOnly);
-    out.setVersion(QDataStream::Qt_6_1);
+    out.setVersion(QDataStream::Qt_6_0);
     out << report;
 
     // Metadata, i.e. size and type of payload
     QByteArray metaBlock;
     QDataStream metaOut(&metaBlock, QIODevice::WriteOnly);
-    metaOut.setVersion(QDataStream::Qt_6_1);
+    metaOut.setVersion(QDataStream::Qt_6_0);
     metaOut << (int)block.size();
 
     m_connection->write(metaBlock);

BenchmarkDemoQt6/remotecontrolsender.cpp

@@ -7,6 +7,12 @@
 #include <QtCore/qurl.h>
 #include <QtWidgets/qfiledialog.h>
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+const int datastreamVersion = QDataStream::Qt_5_15;
+#else
+const int datastreamVersion = QDataStream::Qt_6_0;
+#endif
+
 const QString previousIpKey = QLatin1String("previous_ip_address");
 const QString previousCommandsKey = QLatin1String("previous_command_line_arguments");
 const QString previousTestSetKey = QLatin1String("previous_testset_file");
@@ -108,13 +114,13 @@ void RemoteControlSender::sendCommands(const QString &arguments)
     // Payload, i.e. command-line parameters
     QByteArray block;
     QDataStream out(&block, QIODevice::WriteOnly);
-    out.setVersion(QDataStream::Qt_6_1);
+    out.setVersion(datastreamVersion);
     out << arguments;
 
     // Metadata, i.e. size and type of payload
     QByteArray metaBlock;
     QDataStream metaOut(&metaBlock, QIODevice::WriteOnly);
-    metaOut.setVersion(QDataStream::Qt_6_1);
+    metaOut.setVersion(datastreamVersion);
     metaOut << (int)block.size();
     metaOut << payloadType;
 
@@ -142,7 +148,7 @@ void RemoteControlSender::sendTestSet(const QString &filename)
     // Payload, i.e. command-line parameters
     QByteArray block;
     QDataStream out(&block, QIODevice::WriteOnly);
-    out.setVersion(QDataStream::Qt_6_1);
+    out.setVersion(datastreamVersion);
 
     const QFileInfo fileInfo(filename);
     if (!fileInfo.exists()) {
@@ -167,7 +173,7 @@ void RemoteControlSender::sendTestSet(const QString &filename)
     // Metadata, i.e. size and type of payload
     QByteArray metaBlock;
     QDataStream metaOut(&metaBlock, QIODevice::WriteOnly);
-    metaOut.setVersion(QDataStream::Qt_6_1);
+    metaOut.setVersion(datastreamVersion);
     metaOut << (int)block.size();
     metaOut << payloadType;
 

BenchmarkDemoQt6/remotecontrolsender.h

@@ -3,6 +3,7 @@
 
 #include <QtCore/qobject.h>
 #include <QtNetwork/qtcpsocket.h>
+#include <QDataStream>
 
 class RemoteControlSender : public QObject
 {

[Ghost User]

Tips_That_Will_Make_You_a_Great_Article_Writer.pdf

[Ghost User]

How_to_write_college_essay_without_pressure.pdf