summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.9.9v5.9.95.9Antti Kokko2019-12-021-0/+20
| | | | | | | + 7ed425829e2e5b39754228ff7d5795d85bdd3e8f Bump version Change-Id: I7b7d6f33ea6bbe116754691242b938ad5459c9cc Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionFrederik Gladhorn2019-05-231-1/+1
| | | | Change-Id: I7e4b4109ddb2479d467b0322c7d79bb0cf62d1d9
* Merge remote-tracking branch 'origin/5.9.8' into 5.9Qt Forward Merge Bot2019-04-251-0/+20
|\ | | | | | | Change-Id: I30c19c2c46272aa017ca4457c716ebb7d48149b7
| * Add changes file for Qt 5.9.8v5.9.85.9.8Antti Kokko2019-03-271-0/+20
|/ | | | | | | + 92080d655baaefc3ee58eae4c3f94b0ec2985c12 Bump version Change-Id: Id1f04755a663fa1048794774b3aa7eb14fc541d3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.9.7' into 5.9Qt Forward Merge Bot2018-10-231-0/+20
|\ | | | | | | Change-Id: I96c3e621858a26e1a6a0c810534725a9c88288e2
| * Add changes file for Qt 5.9.7v5.9.75.9.7Antti Kokko2018-10-031-0/+20
| | | | | | | | | | | | | | + 1c190dca7930873d5be997fc673708262180e20b Bump version Change-Id: If8036d48b7d13384929ac51556a6585acad658b1 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Bump versionOswald Buddenhagen2018-10-111-1/+1
|/ | | | Change-Id: Ibb76b108e2c6b2ab9207825d78c7642933322c0b
* Merge remote-tracking branch 'origin/5.9.6' into 5.9Qt Forward Merge Bot2018-06-131-0/+24
|\ | | | | | | Change-Id: I81da64f05c958e1c343fb6560d236c224787c57c
| * Add changes file for Qt 5.9.6v5.9.65.9.6Antti Kokko2018-05-281-0/+24
| | | | | | | | | | Change-Id: I7cc575244a41d49725c0cbf9daf6072298e6d7bc Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | Bump versionOswald Buddenhagen2018-05-311-1/+1
|/ | | | Change-Id: Ife8a05fc3377109c82cf968d1fb864410f7e4fa5
* Merge remote-tracking branch 'origin/5.9.5' into 5.9Qt Forward Merge Bot2018-04-111-0/+26
|\ | | | | | | Change-Id: I889bbe77f5267c3a4ea9c71e5f72fd32d6a0fd8f
| * Add changes file for Qt 5.9.5v5.9.55.9.5Antti Kokko2018-03-211-0/+26
| | | | | | | | | | Change-Id: Id20df0c3be05b67e8c78e7a98bc693b14b858306 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | Bump versionOswald Buddenhagen2018-03-191-1/+1
|/ | | | Change-Id: If338a513ef7ce45bfed376f956cace53e7c8c046
* Don't poll for POLLIN event if device is open in WriteOnly on LinuxDenis Shienkov2018-03-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Following code snippet: QSerialPort serial("/dev/ttyUSB0"); serial.open(QIODevice::WriteOnly); serial.write("ABCDEF"); serial.waitForBytesWritten(-1); causes an application crash if some of data will be received by the serial port. Reason is that qt_poll_msecs() triggered with POLLIN event, even if the device is opened with O_WRONLY flag. In this case the readNotification() handler is called, which trying to reserve some space from the uninitialized read QRingBuffer, that causes an assertion. Solution is to don't use the POLLIN event if device is open with O_WRONLY flag. Change-Id: I0eb0a0c7072ce164a6c0fe518521b87383b84505 (cherry picked from commit ea1a95d3567f1264126bf34218a5532ffb5afc51) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | Change-Id: I29151ab5f41a7f9ef4da23a59bd5bac5c76ca375
* Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+25
|\ | | | | | | Change-Id: I459e19923eca24fc8a7dcc059d6f82633b872168
| * Add changes file for Qt 5.9.4v5.9.45.9.4Antti Kokko2018-01-081-0/+25
| | | | | | | | | | Change-Id: Ib631f29d1b06f1a0906ecdccd3d16f2d6e620fad Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix license headersJani Heikkinen2018-01-066-1693/+38
|/ | | | | | | | - Replace old header.LGPL21 usage with header.LGPL one - Remove unnecessary license files Change-Id: I3613e00d58634c7f2eb634f305a34b7e4940c569 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | Change-Id: I6a4375892d59dbbd8efd7f833fb8f53ff3fd67db
* Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+25
|\ | | | | | | Change-Id: I446d6563802b347a113285e64276f87f677f1c75
| * Add changes file for Qt 5.9.3v5.9.35.9.3Antti Kokko2017-11-081-0/+25
|/ | | | | | Change-Id: I419b6a1e9ff9803e4a87c5cebb17f416a2ce42bf Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Merge remote-tracking branch 'origin/5.9.2' into 5.9Liang Qi2017-10-061-0/+24
|\ | | | | | | Change-Id: I983cf33535b217426d86b92e6f9408408caf5a35
| * Fix content of changes file for v5.9.2v5.9.25.9.2Denis Shienkov2017-09-261-1/+1
| | | | | | | | | | | | Change-Id: I484ad2e5bf366cdbffc01c97bbd45f4814fe9045 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * Add changes file for Qt 5.9.2Jani Heikkinen2017-09-221-0/+24
| | | | | | | | | | | | Task-number: QTBUG-62744 Change-Id: Id4d229e70babbfe2cf72298cb8b1f84f0c01e90b Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | Change-Id: Ib999f791526f7648b567f0a2541fbc6ac68e3ad2
* | Update waitFor{ReadyRead|BytesWritten} documentation for timeoutsAndre Hartmann2017-09-291-2/+2
|/ | | | | | | | | [ChangeLog][QSerialPort] Added a note to the documentation that waitForReadyRead() and waitForBytesWritten() never time out if the parameter msecs is -1. Change-Id: I5852da14faf1bba5a338db6a8764da582238aae7 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Exclude the QtSerialPort module from the VxWorks buildJake Petroules2017-09-081-0/+1
| | | | | | | It doesn't compile on that platform. Change-Id: I604d2b0d7c4b2c326b05e8e309b74164cb69d44c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* Add changes file for Qt 5.6.3Antti Kokko2017-09-011-0/+26
| | | | | | | Task-number: QTBUG-62709 Change-Id: I217f27605d1f8b19069b21e5ff6f67c658506a2c Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Check if the currentPortName is empty on blockingmaster exampleMika Salmela2017-08-301-0/+5
| | | | | | | | | If there isn't serial ports available and the user still press the Start button, the example will crash. This patch adds the check if the currentPortName is empty and throws an error on that case. Change-Id: I7e85f398e2844064fb9b00cecfdf2afa271d7de0 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Merge remote-tracking branch 'origin/5.9.1' into 5.9Liang Qi2017-06-301-0/+24
|\ | | | | | | Change-Id: I36eef79e45e4dbc030b738d4453d7727d3418b48
| * Add changes file for 5.9.1v5.9.15.9.1Jani Heikkinen2017-06-201-0/+24
| | | | | | | | | | | | Change-Id: I4b203538574e67c33c45a295b79bb13f6dcd244c Reviewed-by: Alex Trotsenko <alex1973tr@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | Change-Id: I86804f418157aaa5fba0614bd68abb1d504aaa9c
* | Update binary compatibility files for Qt5.9.0 for QtSerialportMilla Pohjanheimo2017-06-301-0/+4274
|/ | | | | | | Binary compatibility files updated for Qt5.9.0 Change-Id: Ib1009be62ab89954ea7221de88d8c0a748c8c017 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-311-0/+25
|\ | | | | | | Change-Id: Ie6c5829bb5816b31a337976228dd218767c7c87d
| * Add changes file for 5.9.0v5.9.0-rc2v5.9.0-rc1v5.9.05.9.0Jani Heikkinen2017-05-111-0/+25
| | | | | | | | | | | | | | Listing important changes and bug-fixes. Change-Id: If72171427d5cf3de39f9404e15dc3b394d78a265 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Bump versionOswald Buddenhagen2017-05-101-1/+1
| | | | | | | | Change-Id: Ifc7f1e60966489b0352ef326a7fa5d141eee8d8f
* | QSPP::startAsyncRead(): set a correct type for variableAlex Trotsenko2017-05-041-1/+1
|/ | | | | | | | 'bytesToRead' takes the result of signed 64-bit computation which could be negative. So, its type should be qint64. Change-Id: Ib51129143fcb70475ad383df417ae4282c858e41 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Fix possible UB in ReadFile()v5.9.0-beta4Alex Trotsenko2017-04-251-1/+1
| | | | | | | | This patch replicates commit 225ef1baeb0e49f157f3ba1271915e623bd27dd9 for Windows. Change-Id: Ic4e3444183289e7ce1a487500633fb5ad95590b9 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Fix possible UB in read() under UnixAlex Trotsenko2017-04-221-1/+1
| | | | | | | | | | If the user calls setReadBufferSize() with a value lesser than the current size of the read buffer, then we get UB in readNotification(): readFromPort(nullptr, some_negative_value); Change-Id: Iddf5838c84c8615670285e9883c48f29faacc07e Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Fix bytesToWrite()Alex Trotsenko2017-04-221-2/+5
| | | | | | | | | We should not add the size of the internal write buffer here because QIODevice::bytesToWrite() already checks it. Also, take into account the size of 'writeChunkBuffer' on Windows. Change-Id: I87dfcb4dd1cd9d2bbb6f82a084d79fb4db9323d8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Exclude the QtSerialport module from INTEGRITY buildv5.9.0-beta3v5.9.0-beta2v5.9.0-beta1Kimmo Ollila2017-03-271-0/+1
| | | | | | | | This module is not yet supported on INTEGRITY and therefore we'll exclude it from the CI build. Change-Id: Ia08354f0680865f0a2e08a3a3e3f59a88e98bd4e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Doc: Remove unnecessary \fn tag for the swap() functionDenis Shienkov2017-03-181-2/+1
| | | | | | | ... as this function is implemented in cpp file. Change-Id: Ia5a0c262ebdb4b98b4575c85ab45fdc93742731f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-103-0/+4287
|\ | | | | | | Change-Id: Ib336529542ae9b78937ad1573fde71ccfcc4c1ad
| * Doc: Describe limitations to use of QSP::setRequestToSend()5.8Denis Shienkov2017-03-061-0/+4
| | | | | | | | | | | | | | | | The limitations were introduced by the commit 56c001b, but were not documented. Change-Id: I5e44ab78e2e5cce2477ebc1f83280fa8c22e0ef6 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Binary compatibility file for qtserialport (5.8.0)Milla Pohjanheimo2017-02-031-0/+4259
| | | | | | | | | | | | | | Added binary compatibility file for qtserialport Change-Id: Ic676c4a92f798746e43e11bd61deb67a3ad9031b Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-261-0/+24
| |\ | | | | | | | | | Change-Id: I589b584f7929c781c814a2e8da680917ec34012f
| | * Add changes file for 5.8.0v5.8.0-rc1v5.8.05.8.0Antti Kokko2016-12-121-0/+24
| | | | | | | | | | | | | | | Change-Id: Ib60b1ce21226d5702ee7c999508a484d9596c9fd Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Fix build with API >= 21BogDan Vatra2017-02-231-1/+7
| | | | | | | | | | | | | | | Change-Id: I77f015100f2b9ed5e1a16ebd1ba0b28216282085 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | | Exclude qtserialport build from tvOS and watchOSJake Petroules2017-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | If it doesn't work on iOS, it won't work on those platforms either. Change-Id: Ie4109eda9ce83339435fb3e221e4bcbbeadac821 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | | Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1Liang Qi2017-01-258-59/+148
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie713faf0d6395f11477fceb35c93388756e33fae