summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | Improve documentation a bitDenis Shienkov2017-01-042-49/+49
| | | | | | | | | | | | | | | | | | | | | | | | ... where has been added the '\c' tag where it is required. Change-Id: Ie346fc147deb535501eb365693a2ff5fe22a98f9 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Bump versionOswald Buddenhagen2017-01-031-1/+1
| | | | | | | | | | | | Change-Id: Ia0a76e03ab9484c6664615c67a66c8696eabae06
| * | qserialport.cpp: Silence deprecation warningFriedemann Kleint2016-12-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | qserialport.cpp: In member function 'void QSerialPort::setSettingsRestoredOnClose(bool)': qserialport.cpp:627:9: warning: 'void QSerialPort::settingsRestoredOnCloseChanged(bool)' is deprecated [-Wdeprecated-declarations] Change-Id: I4ed17403cd1692c4f965a69be711f0c5b03a8376 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * | Fix connect statement in terminal sampleSamuel Gaist2016-12-061-1/+1
| |/ | | | | | | | | | | | | | | This patch corrects the connect statement used to show the settings dialog. Change-Id: I6318e18f7a281d8ddb118ef1f1d2d18e86df9b22 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-265-9/+93
| |\ | | | | | | | | | Change-Id: Ia83609bd366762621857a6c63bf935a6cd230742
| | * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-241-4/+0
| | |\ | | | | | | | | | | | | Change-Id: Icc6c6b9251819451d7ac170bc1c518a094878743
| | | * remove dependencies from sync.profileOswald Buddenhagen2016-11-061-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: Ibde79e1be1701519505020d31c6d713ae2af4830 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| | * | Add changes file for 5.7.1v5.7.15.7.1Jani Heikkinen2016-11-041-0/+27
| | | | | | | | | | | | | | | | | | | | Change-Id: I85decd74c3fff4ee1710af8c38b435f57da3b610 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| | * | Do not reset RTS after changing other properties on WindowsDenis Shienkov2016-09-232-2/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing any of serial port properties drops RTS, which has been set earlier, since the fRtsControl field of DCB structure always has RTS_CONTROL_DISABLE value (except hardware flow control). Thus, using one EscapeCommFunction() function inside of QSP::setRequestToSend() method is not enough. We need set there also the fRtsControl field to RTS_CONTROL_ENABLE(DISABLE) value and keep it unchanged. Task-number: QTBUG-55907 Change-Id: I7e407b0de9f970f5d11f61c0e360d4735a0acb84 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| | * | Fix crash after closing of ejected device on LinuxDenis Shienkov2016-09-211-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the user calls QSP::close() in a slot which is connected to the QSP::error() signal, then the application is crashed. The reason is that we emit the QSP::error() signal before than we call QRingBuffer::chop() of an internal read buffer, which becomes invalid after the QIODevice::close() called. Therefore, we need just call QRingBuffer::chop() before than the QSP::error() signal will be emitted. Task-number: QTBUG-55847 Change-Id: If536f9cf5cbc1b813d3642bdf9be0867e06368e8 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Alex Trotsenko <alex1973tr@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-151-10/+10
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I96ee91aacae9d2768238dd3368771c26c3e02709
| * | | Replace QCFString::to(CF/NS/Q)String usage with QString methodsv5.8.0-beta1Liang Qi2016-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Just follow 669add9 in qtbase. Change-Id: I080d6272541bf8bd8a209ffbf257578aa6a57ae8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Darwin: Fix deprecation warning on usage of QString(const char *)Erik Verbruggen2016-10-061-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By wrapping the kIOConstants in the CFSTR macro, this also prevents the creation of temporary QString objects. Change-Id: I04baf9e3f3076f0134e5eb924c2dbf5da011acad Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-214-1/+8229
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ib1ba5b90b0e3f911c00eb19e19ac2c92ca363ab8
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-194-1/+8229
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I4f2c44fa70f4f0905daf22c619c597a4a1972c85
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-173-1/+3995
| | |\ \ | | | |/ | | | | | | | | Change-Id: I3c5b0052f5645ead630e33bce46b360fa0135061
| | | * Merge remote-tracking branch 'origin/5.6.2' into 5.6Liang Qi2016-09-161-0/+28
| | | |\ | | | | | | | | | | | | | | | Change-Id: I32be772e436bdf252ce286c059825b2f112d5d1f
| | | | * Add changes file for 5.6.2v5.6.25.6.2Antti Kokko2016-09-131-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I026f40dd689220352ce7cd364401c22451bf2a2c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | | * | BC data files for QtSerialPort for Qt 5.6Milla Pohjanheimo2016-09-131-0/+3952
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Added binary compatibility data files for tst_bic test Change-Id: I0c3c4fc4e7d48fdcd1bec4a65a51a79f1a1a88ca Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| | | * Add mention of QSP::waitForX() functions in documentationDenis Shienkov2016-08-051-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... otherwise the snippet with the blocking reading does not make sense logically. Change-Id: I5a037e7c44f50e57a1c48ab37764f9e7367a6dec Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>