diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-04 03:00:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-04 03:00:13 +0200 |
| commit | efbd2ad4a71cecd389966248651f8a0f1f4a104e (patch) | |
| tree | 62e660440382fecee838edb21e91b331bfdddb1c | |
| parent | 3bd1ef6f823b74b39b74c0268fa97a6c057e2ec5 (diff) | |
| parent | ac42d33351519e42be93c2585a8a9b15832d5d7f (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I498488f5427d67579c19f78ab365ff6c7f938577
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/mqtt/qmqttconnection.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index db74e71..56c0f31 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += warning_clean -MODULE_VERSION = 5.11.1 +MODULE_VERSION = 5.11.2 diff --git a/src/mqtt/qmqttconnection.cpp b/src/mqtt/qmqttconnection.cpp index 0af25ae..3ea82ad 100644 --- a/src/mqtt/qmqttconnection.cpp +++ b/src/mqtt/qmqttconnection.cpp @@ -305,6 +305,7 @@ bool QMqttConnection::sendControlConnect() } m_internalState = BrokerWaitForConnectAck; + m_missingData = 0; return true; } |