summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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.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>
* | 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>
* | | 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>
* | | | Replace local 'static const' integers with 'enum'Denis Shienkov2016-06-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure whether this improves anything, but it can't make it worse. Enumerators are always rvalues and never end up in the .rodata part of binaries; static variables (const or not) are lvalues and therefore can get their address taken. Change-Id: I24155e5a3224fd6a33885a7ca3194ac53879d2c5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | Simplify the isVirtualNullModemDevice() functionDenis Shienkov2016-06-061-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I24a9ee262255f9d42e54b7e701ceca7850383913 Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru> Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
* | | | Remove unused static variableDenis Shienkov2016-06-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If86072aa6f5df1485856f4e07bb057106977ab8e Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru> Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
* | | | Add some missed 'const' and 'Q_NULLPTR' keywordsDenis Shienkov2016-06-031-3/+3
|/ / / | | | | | | | | | | | | Change-Id: Iaf06a0b3a8304ad44519f8d2187665c9f0d02aba Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Add changelog for Qt 5.7.0v5.7.0-rc1Antti Kokko2016-05-241-0/+23
| | | | | | | | | | | | | | | Change-Id: I74babd844ac5658255e25d6d139c21acfa98a1bb Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* | | Merge 5.7 into 5.7.0Oswald Buddenhagen2016-05-2026-54/+104
|\ \ \ | | | | | | | | | | | | Change-Id: I2e0737fab1c12657d8dc7de5d1882ecb73bbb5f2
| * \ \ Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-1917-22/+61
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6a4c3e446633e6f142b87c268096b1bdc1598a62
| | * | Bump versionOswald Buddenhagen2016-05-191-1/+1
| | |/ | | | | | | | | | Change-Id: I64efbfd780839873b8e28832fcd5c1324fd404f7
| | * Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: Ife24588c333e014f8cdd8367153e8d0643db5f83 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| | * Remove superfluous check during removal of the pointerDenis Shienkov2016-05-042-16/+8
| | | | | | | | | | | | | | | | | | | | | | | | ... as deleting of a null-pointer it is a valid operation. Change-Id: Ia4ffd8b69ab75b9e3b200ce2ce999ab2820b915e Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> Reviewed-by: André Hartmann <aha_1980@gmx.de>
| | * Avoid allocating a string by using a QStringRefFrank Meerkoetter2016-05-011-1/+1
| | | | | | | | | | | | | | | Change-Id: I01693dcdbd8a0e99a2845d16676c4e9302d244e6 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| | * enable build of master and slave examplesOswald Buddenhagen2016-04-281-1/+1
| | | | | | | | | | | | | | | Change-Id: I0680e485a0c3ecde410a090204f192ece66fa6c4 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| | * add example installsOswald Buddenhagen2016-04-2811-0/+33
| | | | | | | | | | | | | | | Change-Id: Iadcc0afaae8a54f10a587f0b2f37db128d7ea02d Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| | * remove most pointless CONFIG+=orderedOswald Buddenhagen2016-04-281-1/+0
| | | | | | | | | | | | | | | Change-Id: I3d0c3cc192c3da07dfcd59f64a7c61864fe20ad8 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| | * Fix reading of data remainder with CDC USB device on WindowsDenis Shienkov2016-04-272-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases the WaitCommEvent function does not triggered, even if the input driver's queue has an unread bytes. Most likely this happens if a bytes has been arrived between calls of ReadFile and WaitCommEvent. Thus, it can be avoided by means of ClearCommError function which should be called in end of ReadFile to require amount of bytes that has been arrived but still are unread. If it returns more than zero, then we start reading again, without calling of WaitCommEvent. Task-number: QTBUG-48677 Change-Id: I054975971a7c1823f7de879669c3d97f31348ed8 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * | Replace 'Q_FOREACH' with the range-based 'for'Denis Shienkov2016-05-1311-32/+43
| | | | | | | | | | | | | | | | | | Change-Id: I057267982ac946ce1ec863a79120cd21cd563c4b Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | | Replace 'forever' with 'for(;;)'Denis Shienkov2016-05-206-10/+10
|/ / | | | | | | | | | | | | | | ... due to 'forever' is planned to be deprecated in Qt, and as 'for' is standard keyword. Change-Id: I05bec96d637389a22a2633e4b2bd8384ba17de10 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Drop the Win CE supportDenis Shienkov2016-05-026-966/+4
| | | | | | | | | | | | | | | | | | | | | | Now we can drop the WinCE (5/6) support, because its compilers do not support the C++11 features, that lead to the further API limitations and so on. Change-Id: I2431d15b1361f1e093fc09ff7fbe824daeac3984 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
View Lorry Controller Status