summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2Qt Forward Merge Bot2019-04-061-0/+6
|\
| * QModbusReply: Add some more documentation cross linksAndre Hartmann2019-03-281-0/+6
* | Implement handling for sending Modbus RTU broadcast requestsKarsten Heimrich2019-04-016-11/+53
* | Add context information to QObject::connect(...) callsKarsten Heimrich2019-04-014-16/+17
* | Rewrite RTU master state machineKarsten Heimrich2019-04-014-140/+139
* | Move lambda code into separate functionsKarsten Heimrich2019-04-011-132/+155
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-274-13/+13
|\|
| * VirtualCAN: Slightly adopt debug outputAndre Hartmann2019-03-251-4/+4
| * Fix typosKarsten Heimrich2019-03-212-2/+2
| * Bump versionKari Oikarinen2019-03-211-1/+1
| * Correct typos in qmodbuspdu.cpp's docThibaut Cuvelier2019-03-201-7/+7
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-161-0/+20
|\|
| * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
| |\
| | * Add changes file for Qt 5.12.2v5.12.2Antti Kokko2019-02-211-0/+20
| |/
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1v5.13.0-alpha1Qt Forward Merge Bot2019-02-022-0/+5123
|\|
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-012-0/+5123
| |\
| | * Add changes file for Qt 5.12.1v5.12.1Antti Kokko2019-01-131-0/+20
| | * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-083-3/+30
| | |\
| | * | Add binary compatibility file for QtSerialBus for Qt 5.12Milla Pohjanheimo2018-12-181-0/+5103
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-220-0/+0
|\| | |
| * | | Bump versionKari Oikarinen2019-01-141-1/+1
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-100-0/+0
|\| |
| * | Bump versionKari Oikarinen2019-01-071-1/+1
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-152-2/+29
|\| |
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-112-2/+29
| |\ \ | | |/ | |/|
| | * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+26
| | |\
| | | * Add changes file for Qt 5.11.3v5.11.3Antti Kokko2018-11-191-0/+26
| | * | Make pduFromStream work on big endianDmitry Shachnev2018-11-111-2/+3
| | |/
| | * Bump versionOswald Buddenhagen2018-11-081-1/+1
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-081-0/+54
|\| |
| * | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+54
| |\ \
| | * | Fix changes file for 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0Andre Hartmann2018-11-061-4/+2
| | * | Add changes file for Qt 5.12.0v5.12.0-beta4Alex Blasche2018-11-051-0/+56
* | | | Compile-fix (g++ 8): move #include of mocs outside namespaceEdward Welbourne2018-11-302-4/+4
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-171-5/+11
|\| | |
| * | | Improve QModbusDevice connect/open documentationAlex Blasche2018-11-141-5/+11
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-107-7/+0
|\| | |
| * | | remove pointless PLUGIN_EXTENDS stanzasOswald Buddenhagen2018-11-077-7/+0
| |/ /
* | | Remove hard QtSerialPort dependency from QtSerialBusAlex Blasche2018-11-0718-15/+95
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-031-2/+8
|\| |
| * | Ensure QModbusReply::finished() is emitted after disconnect from serialAlex Blasche2018-10-291-2/+8
* | | Merge remote-tracking branch 'origin/5.12' into devAlex Blasche2018-10-294-8/+110
|\| |
| * | Fix incorrect reading and writing of QModbusServer registersAlex Blasche2018-10-242-5/+72
| * | Fix RTU Master ignoring responses due to being in Send stateAlex Blasche2018-10-241-2/+11
| * | Permit dropping of RTU slave request buffer under certain scenariosAlex Blasche2018-10-231-0/+24
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-231-1/+3
| |\|
| | * Fix case of accessing deleted memoryAlex Blasche2018-10-221-1/+3
* | | Deprecate qserialbusglobal.h in favor of qtserialbusglobal.hAlex Blasche2018-10-2411-12/+17
* | | Fix implicit conversion loss warnings due to int precisionAlex Blasche2018-10-243-4/+4
* | | Add ability to monitor and reject incoming TCP modbus connectionsAlex Blasche2018-10-233-0/+90