Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: Ia2af053a10b3b33a3f73bd3d10636e33ad2519c4

1 files changed, 5 insertions, 0 deletions

diff --git a/tests/auto/qmqttclient/tst_qmqttclient.cpp b/tests/auto/qmqttclient/tst_qmqttclient.cpp
index 8aec3d5..c4da40d 100644
--- a/tests/auto/qmqttclient/tst_qmqttclient.cpp
+++ b/tests/auto/qmqttclient/tst_qmqttclient.cpp
@@ -486,6 +486,8 @@ public slots:
         } else {
             response += char(0); // ackFlags
             response += char(0); // result
+            if (version == QMqttClient::MQTT_5_0)
+                response += char(0); // No properties
         }
         qDebug() << "Fake server response:" << connectionSuccess;
         socket->write(response);
@@ -493,6 +495,7 @@ public slots:
 public:
     QTcpServer *server;
     QTcpSocket *socket;
+    QMqttClient::ProtocolVersion version{QMqttClient::MQTT_3_1_1};
     bool connectionSuccess{false};
 };
 
@@ -509,6 +512,8 @@ void Tst_QMqttClient::reconnect_QTBUG65726()
     client.setHostname(QLatin1String("localhost"));
     client.setPort(5726);
 
+    server.version = client.protocolVersion();
+
     client.connectToHost();
     QTRY_COMPARE(client.state(), QMqttClient::Disconnected);
     QTRY_COMPARE(client.error(), QMqttClient::ProtocolViolation);