aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kampas <martin.kampas@jolla.com>2016-10-13 11:58:02 +0200
committerSvetlana Abramenkova <sabramenkova@luxoft.com>2018-06-05 08:09:21 +0000
commit0c7bf141b08aa9e757e91a4a05769257d043eab2 (patch)
tree91392229ff5a626dd07a112b1591eefec95cdf43
parent73b81cd379569f3fa54924738e00e35444ccbea4 (diff)
Bench: Fix build with Qt < 5.7 (QDataStream::startTransaction())
Change-Id: I22346f765ff3e2c28a66539490cad31a0680b782 Reviewed-by: Svetlana Abramenkova <sabramenkova@luxoft.com>
-rw-r--r--src/bench/main.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/bench/main.cpp b/src/bench/main.cpp
index 9c8b519..728cf9b 100644
--- a/src/bench/main.cpp
+++ b/src/bench/main.cpp
@@ -354,14 +354,20 @@ void MasterApplication::listenForArguments()
connection->close();
});
- connect(connection, &QLocalSocket::readyRead, this, [this, connection]() {
+ QPointer<QBuffer> buffer = new QBuffer(connection);
+ buffer->open(QIODevice::ReadOnly);
+
+ connect(connection, &QLocalSocket::readyRead, this, [this, connection, buffer]() {
QStringList arguments;
- QDataStream in(connection);
- in.startTransaction();
+ buffer->buffer().append(connection->readAll());
+ buffer->reset();
+
+ QDataStream in(buffer);
in >> arguments;
- if (!in.commitTransaction())
+ if (in.status() == QDataStream::ReadPastEnd)
return;
+ Q_ASSERT(in.status() == QDataStream::Ok);
Options options;
parseArguments(arguments, &options);