summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into ↵v5.15.13-lts-lgpl5.15Tarja Sundqvist2024-01-042-2/+11
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I7053ce5196cadf7069fb018d2f8415d3269a8c20
| * Bump version to 5.15.13Tarja Sundqvist2022-12-221-1/+1
| | | | | | | | | | Change-Id: I2d4f3ad3fd914251955892b73c590e6c56f22369 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| * Fix QWinOverlappedIoNotifierIvan Solovev2022-12-121-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f3a306a30fc4f40d1c96fee0ed44517fe8b43d76 started processing the whole input queue in _q_notified() slot. The reads from the input queue are guarded by the hSemaphore variable, and this approach results in discrepancy between the hSemaphore value and the amount of messages in the queue. As a result, we sometimes could try to read from an empty queue, because the semaphore still had a non-zero value. This commit attempts to fix it by manually adjusting the hSemaphore count in such scenarios, and also reorderding the mutex and semaphore calls to make sure that the hSemaphore value is not modified from the QWinOverlapped thread while it is decremented to match the messages count. This commit amends f3a306a30fc4f40d1c96fee0ed44517fe8b43d76. Fixes: QTBUG-108450 Change-Id: I0c568c37119b83aafd5f98a22703b19f37b4fbc9 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit ee17a51a12428924adadd16f8c2fe8246d6bcc7f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.12' into ↵v5.15.12-lts-lgplTarja Sundqvist2023-10-111-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Iaf1a701f4b9da01a672c67f612d4c931b61dc466
| * Bump version to 5.15.12Tarja Sundqvist2022-10-061-1/+1
| | | | | | | | Change-Id: I36c77fcb12191614365a82364c9c99c2d77e896d
* | Update LGPL license headerv5.15.11-lts-lgplTarja Sundqvist2023-08-251-21/+21
| | | | | | | | | | | | | | | | | | The revert e0dc9fd876fd545a491f3d4500ca373d4df0610b added the commercial license header. It needs to be updated as an LGPL header for the opensource release. Change-Id: I7e6a0fd924873a82c1f0fc6f67dbaaf0759cea20 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into ↵Tarja Sundqvist2023-06-098-422/+242
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Icc487eae04437e75442c75643914a3e27baa3b2a
| * Windows: guard against closing the connection while processing incoming dataIvan Solovev2022-06-281-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the patch we could end up using an already deleted QWinOverlappedIoNotifier instance if the incoming queue has more than one message, and the user decides to close the connection (and so delete the notifier) before processing all of them. This patch adds an explicit check that the QWinOverlappedIoNotifier instance is still valid. This commit amends f3a306a30fc4f40d1c96fee0ed44517fe8b43d76 Task-number: QTBUG-101444 Change-Id: Ieae622d248629827ed627bc9c17f7b5be491b717 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 089f1cd197e93c216aae094ffbca2b4beacf57b8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * Bump versionTarja Sundqvist2022-06-151-1/+1
| |
| * Windows: fix soft memory leak in synchronous modeIvan Solovev2022-06-131-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWinOverlappedIoNotifier is using an atomic 'waiting' variable to make sure that it does not emit _q_notify() signals in synchronous mode. However this does not work in practice, because a notification from the I/O completion port thread can come before we enter the blocking waiting function, and the signal will be emitted anyway. Those signals migth never processed when using synchronous read/write, because in such scenarios QSerialPort works in an infinite loop in its own thread, probably without leaving a change for proper event processing. This leads to a situation when a lot of signals are queued on the event loop, and the memory consumption grows. This patch introduces another atomic variable to make sure that a new signal is never emitted until the previous one is processed. With such approach we have maximum one signal pending on the queue. The drawback of this approach is that when working in asynchronous mode, notifications might come faster than we process them, so the processing queue might grow. To solve this, we update the code that is handles notifications in asynchronous mode to process the whole input queue instead of only one item. Fixes: QTBUG-101444 Fixes: QTBUG-103822 Fixes: QTBUG-93865 Fixes: QTBUG-91237 Fixes: QTBUG-87151 Change-Id: Iad3c14ea5f0d3f3f3f9d483a1e6ab3e8b3c6c573 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
| * Revert "QSerialPort: Port to alertable I/O functions on Windows"Ivan Solovev2022-06-136-418/+217
| | | | | | | | | | | | | | | | | | | | This reverts commit a0faf986fccdce1d36f3308dc520cdac001f5264. Part of chain revert to go back to QWinOverlappedIoNotifier. Task-number: QTBUG-101444 Change-Id: I1e67458ffd444fc99a25077455cbe648e49bf829 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
| * Revert "Emit _q_notify only if there's no notification pending"Ivan Solovev2022-06-131-7/+3
| | | | | | | | | | | | | | | | | | | | This reverts commit 85ee2c658a45d2958a54045951d236769640337f. Part of chain revert to go back to QWinOverlappedIoNotifier. Task-number: QTBUG-101444 Change-Id: I58d88dfce6736883233afd4e9557a805d1abb708 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
| * Revert "Revert "Emit _q_notify only if there's no notification pending""Ivan Solovev2022-06-131-3/+7
| | | | | | | | | | | | | | | | | | | | This reverts commit f6b43c36b3839dae54308a6437bbdd99ae9a44de. Part of chain revert to go back to QWinOverlappedIoNotifier. Task-number: QTBUG-101444 Change-Id: I393f741a627de91302689fb3f45d0082864c35df Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
| * Revert "Avoid possible symbol clashes on static builds on Windows"Ivan Solovev2022-06-132-4/+4
| | | | | | | | | | | | | | | | | | | | This reverts commit aa00e8eb623d5cb4ba32860dd3671a87f3763f89. Part of chain revert to go back to QWinOverlappedIoNotifier. Task-number: QTBUG-101444 Change-Id: I863ee26ba010371689ccc3083435a5d28fb36fed Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into ↵v5.15.10-lts-lgplTarja Sundqvist2023-04-241-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: If39366d8b07deb8afada59286415a4fea4e0558b
| * Bump versionTarja Sundqvist2022-04-061-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgplTarja Sundqvist2023-03-231-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I2bb700cdf04f6a48785a317dc4b0f8b77401342d
| * Bump versionTarja Sundqvist2021-12-311-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into ↵v5.15.8-lts-lgplTarja Sundqvist2022-11-101-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ibf84740451b9ca8138a4d061af2d9ebef4b0c08f
| * Bump versionTarja Sundqvist2021-11-081-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into ↵v5.15.7-lts-lgplTarja Sundqvist2022-09-121-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I2bd4a2cf69471f8b39c33b8f8de1b24db51d2698
| * Bump versionTarja Sundqvist2021-09-071-1/+1
| | | | | | | | Change-Id: I62279d84f3d83fc49b476589478515f1d64603a5
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-161-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ibcdad29c84078908e94be482a58921fefa43c201
| * Bump versionTarja Sundqvist2021-06-071-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-06-021-1/+1
|\| | | | | | | tqtc/lts-5.15-opensource
| * Bump versionTarja Sundqvist2021-05-201-1/+1
| | | | | | | | Change-Id: I9d55c3daa13c9155e785d8a699e14dc0f18824a2
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵v5.15.4-lts-lgplTarja Sundqvist2022-04-071-1/+1
|\| | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I70c3d935642dd91bf2abb987546610064731def1
| * Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | Change-Id: Ib59002f1ad7214176a6c8d1b0fec05bdad289369
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-2316-310/+310
|/ | | | | | | | | | | This reverts commit 79cc3f07a089e9f58b0b2487b274cca36261bd30. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I1bf013ca03cbdaba7a965ff800c9a5ab9d723ca6 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Update commercial license headersTarja Sundqvist2021-01-2716-310/+310
| | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qtserialport. Examples, tests or documentation files are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a changes in the line count causes failures in tests. Task-number: QTQAINFRA-4217 Change-Id: I35a7e264c70a923884ea0fec2c97ee824476062f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add changes file for Qt 5.15.2Antti Kokko2020-10-281-0/+28
| | | | | | | | | | | - f6113252a96788094825034e7faced0783b00af9 Add changes file for Qt 5.15.1 + 3fa1e3693249cc38b0a598cb2f07d27d86f25233 Bump version + 27ca2cef37e59666de7a038c67dc7e04126cb991 Add changes file for Qt 5.12.10 Change-Id: I48d4f2a413451096fefacb1068add60da731134b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 192e376b01e65e7277772bdc94106613c22cf531) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-10-271-1/+1
| | | | Change-Id: I8cabd8f4d75b389267cc152ce89fd96b9e5f0bce
* Add changes file for Qt 5.12.10Antti Kokko2020-10-161-0/+28
| | | | | | | Change-Id: I54b8156427c72c3f0fb0351248cae2e6bf10210a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 9431549e2e3c75dafa38a6bd7d45cbaa091a632f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: I6d15734ebabd2786dcc400f8b8f74b1adbe7a3e4
* Add changes file for Qt 5.15.1Antti Kokko2020-08-251-0/+20
| | | | | | | | | | + f2fe2d2e25f61da19ba4205968e5bfa29ef86b64 Add binary compatibility file for 5.15 for QtSerialport + 4d85b8ede2ea521dd1a1fae7221293d57d0169be Bump version Change-Id: I45e1084b01ed841a6c0b65d0364a09a9b96e181d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 6f5fa73a354d71d4e86c5cc686b0c0f79d4c52a9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: Ie6ee8d4339081c7e68ae2591bf92b3ff791a3251
* Add binary compatibility file for 5.15 for QtSerialportMilla Pohjanheimo2020-07-131-0/+5079
| | | | | | | Binary compatibility file added. Change-Id: Ib18db2c92a74ae1538d1c52540a721e745aae876 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+18
|\ | | | | | | Change-Id: Ide15f0b126fcb89b7f2e62835c7e9d14bccfcc32
| * Merge 5.15 into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.0Alexandru Croitor2020-04-232-0/+8
| |\ | |/ |/| | | Change-Id: I8013d39f0380ed2baf9716164b09bc61d4f44e35
* | Update the docs on unhandled error conditions in QSerialportKarsten Heimrich2020-04-222-0/+8
| | | | | | | | | | | | | | | | | | | | Commit a1655d6ccf3 has deprecated some error conditions in QSerialport. This patch adds a little bit more information that these error conditions shall be handled in user code now. Fixes: QTBUG-80930 Change-Id: I13e0a27db98729d038fef654a3a36d7091d45358 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * Merge remote-tracking branch 'origin/5.15' into 5.15.0Qt Forward Merge Bot2020-04-221-0/+20
| |\ | |/ |/| | | Change-Id: If6410e6a195eaec0860f8a0152e5fc84fdafc066
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
|\ \ | | | | | | | | | Change-Id: Id6d8188e38638133389752ad5bc469c0fc3f2968
| * \ Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | | | | | | | | | | | Change-Id: I5849ef7f3294df10f9e7f148696450018d3d54d5
| | * | Add changes file for Qt 5.14.2v5.14.2Antti Kokko2020-03-101-0/+20
| |/ / | | | | | | | | | | | | | | | | | | + 553b62badf129ab36c1beee844a9b39492479e34 Bump version Change-Id: I49a2ec1059d54677647ace382022380ebe655955 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Add changes file for Qt 5.15.0Antti Kokko2020-04-201-0/+18
| |/ |/| | | | | | | | | | | | | + 54157d73e4710a8adc485dbe4cff622c9b164bdf Bump version + ff3fd7b0330cb76772066ce7162320f4dc1a5c28 Remove deprecated QTextStream operators from examples Change-Id: I5d65b19a8623329959c80b7f07648a288faedf3e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Remove deprecated QTextStream operators from examplesv5.15.0-beta4Topi Reinio2020-04-067-39/+49
| | | | | | | | | | | | | | | | Use '\n' instead. Task-number: QTBUG-82532 Change-Id: I97aec4076bd46f23644099158f346a6ca32a4a0e Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta3v5.15.0-beta2v5.15.0-beta1v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1deed2698132ead4d8553558dd3614e8e063afd3
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | Change-Id: I02ecb8eda7dc796dc6dd4ef42b6be28d034ff60c
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
|\| | | | | | | Change-Id: I62805a2e74b7efff3831b1c5f0cc4ef42a644288
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\ | | | | | | | | | Change-Id: Id51a0ba969c3efab9d49debe7d4b963be83efcc3
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 18:07:20 +0000