summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.05.13.0Qt Forward Merge Bot2019-04-203-5/+21
|\ | | | | | | Change-Id: Ice5a082f2a2a5e5341b8dbf0a2f0133ec8d303ca
| * Fix server test codeMaurice Kalinowski2019-04-181-0/+5
| | | | | | | | | | | | | | | | 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>
| * Verify input bufferMaurice Kalinowski2019-04-181-5/+15
| | | | | | | | | | | | | | | | | | | | 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>
| * Doc: Make "Qt for Automation" the home page for Qt MQTT docsLeena Miettinen2019-04-171-0/+1
| | | | | | | | | | | | | | | | | | 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>
* | Add libfuzzer test for receiving datav5.13.0-beta3Maurice Kalinowski2019-04-182-0/+153
| | | | | | | | | | | | Change-Id: If08d050a92db812e95a668d141d8774e56f9516e Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2Qt Forward Merge Bot2019-03-270-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I39d585f24bda2e68bc4d3bd0b3688a35f5923d53
| * Bump versionv5.12.35.12.3Kari Oikarinen2019-03-211-1/+1
| | | | | | | | Change-Id: I4fda152a1d0a0b30314632060579a8533ea4fd23
| * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-1/+1
| |\ | | | | | | | | | Change-Id: Ia12453b1db45e981400f6e7dd5757cc8630e6b4b
| | * Bump version from 5.12.1 -> 5.12.2v5.12.25.12.2Jani Heikkinen2019-03-011-1/+1
| |/ | | | | | | | | Change-Id: I6e2461e8f7cdc4dd8f8164a94805c3145862d5d9 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* | Disconnect when keepAlive fails to receive pingrespMaurice Kalinowski2019-03-143-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | The specs state that a client SHOULD disconnect after not receiving a pingresp. So far, this needed to be checked manually. However, on Linux a disrupted network connection does not imply QTcpSocket to switch to disconnected state. Hence the client continues to consider the connection active, leading to lost messages and incorrect state. Task-number: QTBUG-74279 Change-Id: I6d8e540f7e89c621e5c010669085882d25440b0a Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Qt Forward Merge Bot2019-02-161-1/+0
|\| | | | | | | Change-Id: I94bfa068ca236d14ba5bc41233129ba3a26f0d33
| * Revert "Disable build for WebAssembly"Morten Johan Sørvig2019-02-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | This actually builds on wasm, just maybe not in the CI system. This reverts commit 354140278d2c42af5aa88ddcde7cde23494b396e. Change-Id: I367e3bfc71e3a83313bf890cc4e9aab4ff7c43b6 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devv5.13.0-alpha1Qt Forward Merge Bot2019-01-301-0/+1
|\| | | | | | | Change-Id: I172b62a79d246327b4b112bc20adce5c305dbd18
| * Disable build for WebAssemblyv5.12.1Maurice Kalinowski2019-01-281-0/+1
| | | | | | | | | | Change-Id: Ibdc6326ea71378b09aeb89e3ee8cb612a4e302f4 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Bump version from 5.12.1 to 5.13.0Jani Heikkinen2019-01-181-1/+1
| | | | | | | | | | Change-Id: I25f5622a5f4c3848a661c6459754004791db29b2 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-102-2/+2
|\| | | | | | | Change-Id: Id55888f5bc8e69b48a0dcce5b22a4f8db75885a8
| * Bump version from 5.12.0 -> 5.12.1Jani Heikkinen2019-01-091-1/+1
| | | | | | | | | | Change-Id: I4619f40e7a0c76b19baca77132d47627db2ef715 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * Doc: Fix typoMaurice Kalinowski2019-01-081-1/+1
| | | | | | | | | | | | Change-Id: I610498dad3672c064f84596eba4b87a653d611f3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add console examplesMaurice Kalinowski2018-12-207-0/+588
| | | | | | | | | | | | | | | | | | | | Other solutions provide minimal console applications for publishing and subscribing, which can then be used as tools. Task-number: QTBUG-69995 Task-number: QTBUG-71957 Change-Id: Ica4a856e25b540d089e1aa20f853b780c18d59dd Reviewed-by: hjk <hjk@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-153-14/+33
|\| | | | | | | Change-Id: I466f6fa0de9cf772701987c8cd697e2ab4060a28
| * Do not set an error when manually disconnectingMaurice Kalinowski2018-12-141-1/+4
| | | | | | | | | | | | | | | | | | In case the transport gets closed by invoking disconnectFromHost(), no error code should be set. Change-Id: I8f85ea6dd6ebe7dbe4e6eea8be48d286a3495a3a Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * Examples: Visual clean upMaurice Kalinowski2018-12-122-13/+29
| | | | | | | | | | | | | | | | | | The UI needed some minimal overhaul to be more consistent. Adapt the layouts. Change-Id: I7e3fdf38faca2264c768fd188bb381a78f6cf4d3 Fixes: QTBUG-64014 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-110-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I89fa51e54b845553aaad877a7d0cb30c21c5512b
| | * Bump version number from 5.11.2 to 5.11.3v5.11.35.11Jani Heikkinen2018-11-141-1/+1
| | | | | | | | | | | | | | | Change-Id: I79c9029b54949583ca436c3405d58483fe6637ad Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-242-7/+7
|\| | | | | | | | | | | Change-Id: Ia24cfcccd6d0e838aaddfacc452adba03e2e2789
| * | Revert "Use const references for non-trivial parameters to signals"v5.12.0-rc2v5.12.0-rc1v5.12.0hjk2018-11-202-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ccd80bb35be42c6278de20d1b7942c0af0dc993f which breaks binary compatibility. Change-Id: Ica34959914db592ce5a138b461cdf1d2f5994c5c Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-173-0/+15
|\| | | | | | | | | | | Change-Id: I495e1c269a8fec76f83229ae4900cf027dac85fc
| * | Take transport errors into accountMaurice Kalinowski2018-11-152-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an error occures during the initial connection request, this was not reflected in the state changes. Hence, we close the connection on any type of error occurring. Change-Id: I871be4600978f403af3637eac1ada70ff6ba06c3 Fixes: QTBUG-71795 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * | Reject connection request while in connecting stateMaurice Kalinowski2018-11-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise might lead to side effects. Task-number: QTBUG-71795 Change-Id: Iad2cbe7613e08d1f90f497d1d65ed2da924f0aeb Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-102-10/+42
|\| | | | | | | | | | | Change-Id: Ib1e1cfc0a7576527418bf63ed0198662114c3bfc
| * | Add username and password editsv5.12.0-beta4Maurice Kalinowski2018-11-052-10/+42
| | | | | | | | | | | | | | | | | | | | | The example was missing that so far. Change-Id: I312dc4e67cb801313bb4811ceced4b78f985e9ab Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-031-0/+28
|\| | | | | | | | | | | Change-Id: I01f17382db5e565903fe30baaffed1f6aed5208a
| * | Add changes-5.12.0Maurice Kalinowski2018-11-011-0/+28
| | | | | | | | | | | | | | | Change-Id: Iba06924f84455ba928b83e2cc5c851e302b10a0e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-1515-54/+76
|\| | | | | | | | | | | Change-Id: If68eb404359b6e2f8a4a970c56d0e67230fd1944
| * | Use const references for non-trivial parameters to signalsv5.12.0-beta3v5.12.0-beta2v5.12.0-beta1v5.12.0-alpha1hjk2018-09-122-7/+7
| | | | | | | | | | | | | | | Change-Id: I03149cbeebcd31dbfd297112b491869a2f104bae Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * | Rename shared subscription functionsMaurice Kalinowski2018-09-127-31/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As agreed on the review process, using sharedSubscription(Name) is more verbose and descriptive. Change-Id: I81fa5d9f74ecd12d3b90d485f67b52dfb4f70bf5 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * | Prefer data members to be privateMaurice Kalinowski2018-09-111-3/+3
| | | | | | | | | | | | | | | Change-Id: I2f0ab08c15c8e8127323733962638fbf3ad2ba7f Reviewed-by: hjk <hjk@qt.io>
| * | MQTT5: Add QMqttStringPair::operator!=Maurice Kalinowski2018-09-112-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is meant for completeness and requested in the API review process. Change-Id: I960c8cd69bd7db86af1112c74bd1a3d68d225903 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | MQTT5: Remove Q_GADGET for property classesMaurice Kalinowski2018-09-114-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initial idea was to add them for future usage within QML context. But right now those are not needed and hence should be removed. Change-Id: Id041f6933bd25eb5ccd87d8629dfe1d94582b68f Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-09-111-0/+25
|/| | | |/ | | | | Change-Id: Iaa14ab0c2216b96ed1e902c198bda624c38dc523
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+25
| |\ | | | | | | | | | Change-Id: Ia0d7f864e4310052f3cef1e1fa4566c962155cdd
| | * Add changes file for Qt 5.11.2v5.11.25.11.2Maurice Kalinowski2018-08-291-0/+25
| |/ | | | | | | | | Change-Id: Ia85924a67afd93e6fd26a5a9bd47a9d09ab3415b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add test for subscription overlapMaurice Kalinowski2018-08-201-0/+86
| | | | | | | | | | | | | | | | Furthermore also verifies subscription IDs are handled properly. Change-Id: I7bad65d6cbbe60fb005056dc0e31ef4e7a0a8ffa Reviewed-by: hjk <hjk@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-08-181-1/+1
|\| | | | | | | Change-Id: I780e10a6fa43d24e2770be9b610a0579d4e66454
| * Fix CMake unit testsKevin Funk2018-08-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | Before failed with: .../qtmqtt/tests/auto/cmake/build/module_includes/main.cpp:4:16: fatal error: QMqtt: No such file or directory #include <QMqtt> ^~~~~~~ Task-number: QTBUG-68343 Change-Id: I1000f533b2b29558f3c2b0d23c64c2c621e641e5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Add documentation for shared subscriptionsLeena Miettinen2018-08-171-0/+25
| | | | | | | | | | | | Change-Id: I7b54142a10643bcf9a114eb83fcdf4e1cdb9f4f9 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Add documentation for topic aliasesMaurice Kalinowski2018-08-171-0/+31
| | | | | | | | | | Change-Id: Idd1993e08b8d17bdd0ab4355b52adaf12149635f Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Update documentationMaurice Kalinowski2018-08-172-0/+289
| | | | | | | | | | | | | | | | | | A couple of enums and member functions have been added since the last update. Change-Id: Ie1a32a9b827a6ce9d203026a46519b73921edaa8 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: hjk <hjk@qt.io>
* | Add reason code support for subscriptionsMaurice Kalinowski2018-08-155-52/+30
| | | | | | | | | | Change-Id: I13064ac4bbd3a42d70485b5055825a824472f9af Reviewed-by: hjk <hjk@qt.io>
* | Add support for reading reason codes during connectionMaurice Kalinowski2018-08-147-48/+73
| | | | | | | | | | | | | | | | | | Connection aknowledgement contains reason codes, which should be reflected to the user. As QMqttServerConnectionProperties already might store the reason string, it is best to combine them. Change-Id: I363be54216204cc695309ddd658996d350ea3f09 Reviewed-by: hjk <hjk@qt.io>