summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | 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>
* | | 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.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>
| * | BC data files for QtSerialPort (5.7)Milla Pohjanheimo2016-09-131-0/+4234
| | | | | | | | | | | | | | | | | | | | | | | | Added the generated data files for the binary compatibility tests for QtSerialPort for Qt 5.7. Change-Id: I5db1fb0e22e0ba62b7c82cbe028b6d4acc215e9d Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | | Adjust to qtConfig() changes in qtbasev5.8.0-alpha1Lars Knoll2016-08-192-2/+2
| | | | | | | | | | | | | | | Change-Id: Ie6e27e8ae0dce6892ee6ab7561876bc439aed073 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Replace QSP::error signal with QSP::errorOccurredDenis Shienkov2016-08-092-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the name of the signal and the name of the getter unambiguous, which in turn allows the easy use of Qt 5-style connects. This commit message was taken from commit qtbase/4672e31. [ChangeLog][QtSerialPort][QSerialPort] Deprecated QSP::error() signal in favor of new QSP::errorOccurred() one. Change-Id: I3f04bb8b1ae686d5368d43741cd0e97748b31b8f Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-0212-235/+381
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/serialport/qserialport.cpp Change-Id: I858fec6e426f5fd867b7eda7b1db69a2d447b357
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-018-26/+46
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: src/serialport/qserialport_win.cpp Change-Id: I8f3403d448ef2e51cf2870b331c61ab808393e34
| | * Detach buffer's segment for asynchronous write operationDenis Shienkov2016-07-203-22/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QRingBuffer does not guarantee that the read pointer which is returned by QRingBuffer::readPointer() will stay valid after calling QRingBuffer::reserve() or QRingBuffer::append(). Thus, we need to detach the buffer's segment and pass it to the WriteFile() function to ensure it stays unmodified for the whole time of the asynchronous operation. Change-Id: I5a42086b4339a050a4df57c39348864502be2c74 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Alex Trotsenko <alex1973tr@gmail.com> Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| | * Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-174-4/+4
| | | | | | | | | | | | | | | | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: Id73b94c13dd718cf849e3e1901f32b40b2f62bdf Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-06-091-0/+31
| | |\ | | | | | | | | | | | | Change-Id: Ib7c2a1881bc1d04145b6dd34074e328925615106
| | | * Add changelog for Qt 5.6.1v5.6.1-1v5.6.15.6.1Denis Shienkov2016-05-201-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6337d0334e21f208fdfba3e0947680d5ff17780c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | | Bump versionOswald Buddenhagen2016-07-281-1/+1
| | | | | | | | | | | | | | | | Change-Id: I5c1304e43c8bfa07f53d397f7a90e84c6276a8bb
| * | | Remove mention of Windows CE supportDenis Shienkov2016-07-151-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As Windows CE support has been stopped since Qt 5.7. Change-Id: I850c5e1e41508502a9e82491f89488facca40f51 Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru> Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * | | QSerialPortInfo: Extract Method anyOfPortAnton Kudryavtsev2016-07-151-22/+11
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic0851ee8d491f29922d55f3c0530ccd21ed171a5 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * | | Start the write timer only when it is inactiveDenis Shienkov2016-07-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie6dd49bec6add204b45f15ff344ba6c92adedb0a Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Alex Trotsenko <alex1973tr@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * | | QSerialPortInfo: use delegate ctor to de-duplicate codeAnton Kudryavtsev2016-07-111-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I698b9afc7b15bdfca7176ea3ec823da1ba91957c Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * | | Use append() instead of memcpy() where possibleDenis Shienkov2016-07-072-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to add the data to the internal QIODevice's buffer, that simplified the code and is more reliable. Change-Id: I61e6c7be3259cd754e4bbe6a3142dcdd6d33f7b6 Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru> Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * | | Minimize number of system calls at openingDenis Shienkov2016-07-073-169/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the method QSP::open() several times calls the system functions to get/set of DCB/termios structures for each parameter. It is not rational and should be minimized as possible, in ideally to once executed. Change-Id: If1f308176a82f3c8896fc648bf656f089e099f3f Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * | | Add tests for RTS and DTR signalsDenis Shienkov2016-06-301-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I148339d731b77975ce56fa79a3ead485bbf02a87 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | | | Add missng default parameters to waitFor() methodsDenis Shienkov2016-07-282-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and adjust their documentation a bit. [ChangeLog][QtSerialPort][QSerialPort] Added missing parameters for waitFor() methods Change-Id: I95d7076bfef47dd75d37960ca8a719ae779737d6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | Reuse QIODevice's write bufferAlex Trotsenko2016-07-192-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieda6cd8452391a1fd3276a35c9854cf764dbb679 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-3025-63/+80
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I576cf803037a823eb4dcbdf5eb0d209735871326
| * | | Replace remaining 0 to nullptr in the examplesDenis Shienkov2016-06-2411-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If867000fe1101c58bc9d48e3794536e46cde6fec Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru> Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * | | Add remaining 'Q_DECL_OVERRIDE' to the examplesDenis Shienkov2016-06-233-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib9590b862413e66189b9f2fde9297af374981b4d Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru> Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * | | Add 'explicit' keyword where possible to the examplesDenis Shienkov2016-06-208-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7338288caf0d3fcb1ecd52d0e6724aa51c108505 Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru> Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * | | Replace 'Q_NULLPTR' and 'NULL' with 'nullptr'Denis Shienkov2016-06-177-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can use nullptr since Qt 5.7. Change-Id: Id5354280d6a94b2c1f4c5967c65a22db878eca3e Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * | | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-161-4/+19
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I5c6b9b995175ca3ad2faeb170157c194eed99f33
| | * | | Mention license change in 5.7.0 changelog.v5.7.05.7.0Kai Koehne2016-06-081-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8e9dc9b230b13e14deef912fedcc3f4cdde582e6 Task-number: QTBUG-53913 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * | | | Use auto in more casesDenis Shienkov2016-06-156-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id4fd74d4d45b28ddc60de6308386728a0eda8bb7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * | | | Replace remaining foreach with range-based forDenis Shienkov2016-06-152-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1fe4be17d8e998ba25ecb6dde53f487eacd2b128 Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
View Lorry Controller Status