1
0
mirror of https://github.com/qt/qtmqtt.git synced 2026-10-25 16:16:26 +00:00
Commit Graph

361 Commits

Author SHA1 Message Date
Antti Kokko
1eadebaf14 Add changes file for Qt 5.14.0
Change-Id: Ie02629aea603a7515ec0ddfdf045f9f0ae53306e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2019-11-21 08:45:11 +01:00
Qt Forward Merge Bot
38610dd856 Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
	.qmake.conf

Change-Id: I74fc1506a8698b3feeeb0aad578ea3b40ed3e935
2019-11-05 07:31:13 +01:00
Maurice Kalinowski
450f2b3dd3 Examples: Remove ping buttons
Since dcf3bbb980 introduced
autoKeepAlive, users should not send a ping message manually
unless it is disabled.

Change-Id: I4b717e2aebc8f40cabf009d4df7e1d146988d434
Fixes: QTBUG-79444
Reviewed-by: hjk <hjk@qt.io>
2019-10-24 16:36:06 +02:00
Maurice Kalinowski
e7d71199ff Use nullptr instead of 0
Change-Id: Id4c8b194ce8ff8ec94fafcf1169a0cc9717684ed
Reviewed-by: hjk <hjk@qt.io>
2019-10-24 15:12:45 +02:00
Frederik Gladhorn
4b3201059d Bump version 2019-10-14 09:43:06 +02:00
Maurice Kalinowski
4e4050fdbd Update usage for encrypted connection
Use the QMqttClient::connectToHostEncrypted() version taking a
QSslConfiguration instead of applying global settings.
Furthermore, the deprecated version will be removed in Qt6.

Change-Id: I4b2a9ff2616ed1c0c645d0081719f2d40c6e3b20
Reviewed-by: hjk <hjk@qt.io>
2019-09-26 12:45:22 +02:00
Qt Forward Merge Bot
b83a7de714 Merge "Merge remote-tracking branch 'origin/5.13' into 5.14" 2019-09-17 03:03:08 +02:00
Qt Forward Merge Bot
dc5e1d76bc Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: If2fa8b871204df26a6bd6d20ac7f383c31570d5b
2019-09-17 03:03:02 +02:00
Qt Forward Merge Bot
6ad26053ff Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13" 2019-09-05 13:32:37 +02:00
Qt Forward Merge Bot
9c2aa476c3 Merge remote-tracking branch 'origin/5.13.1' into 5.13
Change-Id: Ie3a5d8e3b25e45bfa4202d9931323ab1c514a00c
2019-09-05 13:32:32 +02:00
Konstantin Ritt
954534fb55 Simplify readBufferTyped() routines
get rid of dubious code by generalizing template specializations

Change-Id: Ib23f423f10e63985a11d18a9cfd37178ad18551e
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2019-08-28 15:11:43 +03:00
Maurice Kalinowski
dcf3bbb980 Add autoKeepAlive to QMqttClient
In certain scenarios, a user wants to manually handle the keepAlive.
Introduce autoKeepAlive as a property. If set to false, then the user
needs to handle the keepAlive by invoking requestPing.

The default for this property is true and keeps the current behavior.

Task-number: QTBUG-76782
Change-Id: I073874e6bdacf3c8d128c20431606affe1d9eeb1
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
2019-08-20 15:21:36 +02:00
Maurice Kalinowski
fedb18dd77 Add changes file for Qt 5.13.1
Change-Id: I0711ea10c944951a0e285b9a68ce4a9decb3f8ff
Reviewed-by: hjk <hjk@qt.io>
2019-07-30 12:27:46 +02:00
Marc Mutz
9e7eba636e Mark the module free of Java-style iterators, Q_FOREACH, and QLinkedList
Change-Id: I2506c57ea7138fcfa6666dfc0a9b8ec5b6896757
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2019-07-22 06:03:51 +00:00
Qt Forward Merge Bot
a6683b0958 Merge "Merge remote-tracking branch 'origin/5.13' into dev" 2019-07-16 03:01:06 +02:00
Qt Forward Merge Bot
15f5c8c94c Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I7f7c62d3c006f543e47ad7a54771992ecc582b43
2019-07-16 03:01:01 +02:00
Qt Forward Merge Bot
8cbf5707df Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-07-13 03:01:22 +02:00
Qt Forward Merge Bot
07875126a1 Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I19448cdd1f91a1506687870b2373ec449051ec51
2019-07-13 03:01:17 +02:00
Qt Forward Merge Bot
15853d77b1 Merge "Merge remote-tracking branch 'origin/5.13' into dev" 2019-07-11 14:45:03 +02:00
Qt Forward Merge Bot
9a2e77fc1f Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
	.qmake.conf

Change-Id: I39fabafba7b8bd591909ed6e32be619b1db73cf0
2019-07-11 14:44:26 +02:00
Konstantin Ritt
b4b171877e Avoid MAV after disconnecting due to protocol violation
closeConnection() clears m_readBuffer, so that
`m_readBuffer.constData() + m_readPosition` accesses a disposed memory

Change-Id: Ide4e4d8fdafe81181fceb9ebe2692aaa25ba8034
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2019-07-05 10:10:18 +03:00
Konstantin Ritt
fbc19ff422 Prefer somewhat cheaper QBasicTimer over QTimer for periodic PING
Change-Id: I79ef0c0160894b0179ee347468d85a04809ef6fc
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2019-07-03 13:09:09 +02:00
Liang Qi
234de63b6b Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-07-03 09:38:09 +02:00
Liang Qi
f0a4f3f43b Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
	.qmake.conf
	src/mqtt/qmqttclient.cpp

Change-Id: I2b050319270fb365416623998c758ab9ec63f69d
2019-07-03 09:29:12 +02:00
Maurice Kalinowski
edb2ca969c Fix documentation about keepAlive
Initially the keepAlive was considered to be specified in ms to more
match the Qt API. However, no server allows this granularity and the
specs also state seconds. Internally it was using this pattern already.

Change-Id: I0a25d1ef636c2b909997223c631dc248b613536c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2019-07-02 16:01:57 +02:00
Maurice Kalinowski
d25a0abe78 Allow empty will messages
A will message is allowed to be empty. Hence, check whether a will topic
exists to identify incorporating the last will to the connect message.

Task-number: QTBUG-76783
Change-Id: Ifb7f5467e8e7e70c6d9c050b36a35df2419f4171
Reviewed-by: hjk <hjk@qt.io>
2019-07-02 12:52:04 +02:00
Frederik Gladhorn
23febf5517 Bump version 2019-07-01 16:07:34 +02:00
Frederik Gladhorn
2aa22a5b5b Bump version 2019-07-01 15:56:51 +02:00
hjk
2c24a9ec62 Avoid deprecated use of QTime
Change-Id: If95c4f918b83057001bc43e01e9450ba1d08b475
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2019-07-01 15:42:31 +02:00
Qt Forward Merge Bot
1cd05c3cb3 Merge "Merge remote-tracking branch 'origin/5.13' into dev" 2019-06-29 03:05:40 +02:00
Qt Forward Merge Bot
330192e38c Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I669948f0f2ca632fc8c9817c1dd9028ddbe77ae3
2019-06-29 03:05:34 +02:00
Konstantin Ritt
99886a87c1 Prefer QHash over QMap for faster key lookup
amortized O(1) for QHash VS. stable O(log n) for QMap
+ optimize usage cases by decreasing the amount of key lookups

Change-Id: I169b2d97f07854ce5aca030321820a866d0038ed
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2019-06-28 17:05:45 +03:00
Konstantin Ritt
2d2a226a9e Fix meaning of Maximum Receive connection property
as per MQTT Version 5.0 Standard, `Maximum Receive` property
is the maximum amount of unaknowledged messages (QoS>0),
whilst `Maximum QoS` property is the message's maximum allowed QoS level.

Change-Id: Ia23b259a95f075f71b7eb090f48fc9143aeb4811
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2019-06-28 14:01:06 +00:00
Liang Qi
c937eafe68 Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-06-28 10:35:54 +02:00
Liang Qi
91cefe7217 Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
	.qmake.conf
	examples/mqtt/mqtt.pro

Change-Id: Ic76ff03e314e0d9761ba66372e19f546afcc7d6c
2019-06-28 10:25:49 +02:00
Qt Forward Merge Bot
f86b2882f9 Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12" 2019-06-20 14:15:13 +02:00
Qt Forward Merge Bot
18071ec3b8 Merge remote-tracking branch 'origin/5.12.4' into 5.12
Change-Id: Idc042f181f76c71c4576a047db8257f04cc77ef0
2019-06-20 14:15:13 +02:00
Maurice Kalinowski
61a68c2962 Fix build with -no-gui
Examples requiring a user interface recently need to check for its
availability.

Task-number: QTQAINFRA-2576
Change-Id: I731dfee16bd1a9b5eb0396433213243dfa9b23da
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-20 13:34:44 +02:00
Frederik Gladhorn
667888bd85 Bump version 2019-05-23 11:19:05 +02:00
Qt Forward Merge Bot
96f3395cb8 Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ia2af053a10b3b33a3f73bd3d10636e33ad2519c4
2019-04-27 03:03:26 +02:00
Qt Forward Merge Bot
93c3948c13 Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ibf7dd449a020d2a1c4b391c91b019d9a5b68fa8b
2019-04-20 03:00:26 +02:00
Qt Forward Merge Bot
72257654cc Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ice5a082f2a2a5e5341b8dbf0a2f0133ec8d303ca
2019-04-20 03:00:22 +02:00
Maurice Kalinowski
acff2f2611 Fix server test code
For MQTT 5 the fake server did not send any property information. Hence,
the client (potentially) read among the buffer.

Change-Id: I58c7d1b4a1f15a0803c04495c82537f648c8a642
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2019-04-18 08:13:48 +00:00
Maurice Kalinowski
af08406cd3 Verify input buffer
So far, the implementation relied on the datagrams received to be
correct. This can cause buffer overwrites, including crashes or worse.
While unlikely, verify that requested read size matches the existing
buffer.

Change-Id: I695318142348e58b3b9568135896c52da75109e7
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2019-04-18 08:13:45 +00:00
Maurice Kalinowski
c8a837521b Add libfuzzer test for receiving data
Change-Id: If08d050a92db812e95a668d141d8774e56f9516e
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2019-04-18 08:13:42 +00:00
Leena Miettinen
8d24e8db60 Doc: Make "Qt for Automation" the home page for Qt MQTT docs
When users click the Qt version number on the bread crumb bar in
the Qt Qt MQTT docs, they are directed to the Qt for Automation
docs at doc.qt.io.

Change-Id: Ib59b3497dacb96049ddaaa440f596f2ea67822e1
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2019-04-17 12:32:56 +00:00
Maurice Kalinowski
1a38beab92 Update deprecation of QMqttClient::connectToHostEncrypted
Added documentation flag and also mark the function itself as
deprecated.

Change-Id: I4cc84b2c79ee0849d09b91e1778f38da5478b3c0
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2019-04-04 10:46:21 +00:00
Qt Forward Merge Bot
f250ce436e Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I113b3b1497a95d444d1038fa58ec0d90f050b828
2019-03-30 03:02:02 +01:00
Qt Forward Merge Bot
5e0fcd6199 Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
	.qmake.conf

Change-Id: I39d585f24bda2e68bc4d3bd0b3688a35f5923d53
2019-03-27 10:27:39 +01:00
Kari Oikarinen
cf41d84738 Bump version
Change-Id: I4fda152a1d0a0b30314632060579a8533ea4fd23
2019-03-21 09:17:31 +02:00