summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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-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>
* Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-03-216-0/+12
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/serialport/qserialportinfo_osx.cpp src/serialport/qserialportinfo_unix.cpp src/serialport/qserialportinfo_win.cpp src/serialport/qserialportinfo_wince.cpp Change-Id: I9540cf8c714a99b7ace9aeaeb003cb4a00b8303e
| * Deprecate QSPI::isBusy() methodv5.6.0-rc1v5.6.05.6.0Denis Shienkov2016-02-186-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | It is impossible to implement this method properly on all platforms. Its implementation is complicated and introduces a side-effects, related to the race-conditions, permissions and so on. The user can implement QSPI::isBusy() himself just trying to open a desired device, what is equivalent to the current implementation. Change-Id: I71ef69a1a8edb7c4df23c8b2816add40475e00b5 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-014-0/+0
| | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: Ifcb512c5f4ed8ff8ff0377b335abf4e133ac27cc Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | ... (as far as possible). this fixes static builds by ensuring that all dependencies are exported. this does not fix any extant problem in this module. Change-Id: I9523385adebc8f9ee263bbb7010ebe30f8abe0f7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | Forbid the RTS changing when the HardwareFlowControl was setDenis Shienkov2016-02-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | It is an error when the RTS changes manually when the HardwareFlowControl is set. In this case the driver operates with the RTS automatically, so manual control is not allowed. But some drivers ignore this requirement and do not return errors in attempt of manual RTS control. Thus, we have to forbid change of RTS and to return the UnsupportedOperationError error. Change-Id: I80bc87d51d9c653ed15ec310fca654243821b1e7 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | Get serial number of bluetooth USB dongle on WindowsDenis Shienkov2016-02-191-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | Now, the serial ports which are created by the bluetooth connection takes the serial numbers of the own USB bluetooth dongles. We enumerate all parent devices of a driver stack until their end has been reached, or the serial number has been found. Change-Id: I63820f34fd4c47992c3c5ef3c7ce63eca4ea0cf8 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | Fix documentation of QSPI::standardBaudRates()Denis Shienkov2016-02-171-2/+2
| | | | | | | | | | | | | | | | | | | | This method returns a list of baud rates which are standard for this platform, but not for the current serial port. Change-Id: Ic833aa41da8aab0caaaac054b66208c7094b4589 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | Move QSPI::standardBaudRates() in one placeDenis Shienkov2016-02-166-25/+5
| | | | | | | | | | | | | | | | | | | | Currently we do not need in multiple implementations of this method, and can move it to the qserialportinfo.cpp file. Change-Id: I9d27c739ebd07f76a0e4e808766052bf90d4c19b Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | Enumerate dial-in devices on OS XDenis Shienkov2016-02-151-11/+27
| | | | | | | | | | | | | | | | | | | | | | OS X divide serial ports into dialin (tty) and callout (cu) devices. QSPI did not return a list of dialin devices, that now has been fixed in this patch. Task-number: QTBUG-50895 Change-Id: I9f25b8f042ce1fdef9fd140896fc1d7093ee91a1 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | Enumerate dial-in devices on FreeBSDDenis Shienkov2016-02-151-9/+29
| | | | | | | | | | | | | | | | | | | | BSD-like systems divide serial ports into dial-in (tty) and dial-out (cua) devices. QSPI did not return a list of dial-in devices, that now has been fixed in this patch. Change-Id: I593719429e3b6641012eb046851dd08b9dc829fb Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-02-151-0/+53
|\ \ | |/ | | | | Change-Id: Ib4860caca56cc971016b5fa2fff50f72ea320c28
| * Add changelog for 5.6.0 versionDenis Shienkov2016-02-101-0/+53
| | | | | | | | | | | | Change-Id: I5557b7651f96bd83a9665eee1b792d6e2b9d2409 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | Move the FreeBSD code to own implementation fileDenis Shienkov2016-02-114-295/+370
| | | | | | | | | | | | | | | | ... that simplified a code and its maintenance. Change-Id: Ic4a7aa14a461bd99c745665c56300c13ab84691d Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | Bump versionOswald Buddenhagen2016-02-081-1/+1
|/ | | | Change-Id: I479d9a1c08d0291a21d05bd0cdd5763ca8e76cd4
* Get rid of QSPP::updateCommTimeouts() methodDenis Shienkov2016-01-113-22/+6
| | | | | | | | | | This method is used only once when initializing of a device. Thus its code can be moved to an initialization place, and this method can be removed then. Change-Id: Ie9a40da1d6a2980829327f66830893ad7179bd57 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Suppress error emission when closingDenis Shienkov2016-01-112-17/+8
| | | | | | | | | | | | When the error signal is connected to a slot which calls QSP::close() and an error occurs in this method, this would lead to infinite recursion. Other Qt I/O classes avoid this problem by not emitting errors while closing the device, so we should not, either. Task-number: QTBUG-50052 Change-Id: Icfbcb19c32b8bd7fc586ab5253dc754e78829f11 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Add simple enumeration of ttyTHSx devices on LinuxDenis Shienkov2015-12-311-0/+1
| | | | | | | | | ... when udev or sysfs are unavailable. Task-number: QTBUG-50223 Change-Id: I90ec57bcb95e6ade70eb080f553f8324b7e84387 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Fix detection of 8250 serial ports type by udev backendDenis Shienkov2015-12-311-1/+1
| | | | | | | | We need to pass a full device path into isValidSerial8250() function. Change-Id: I771a2518fa9ec89e9519992fd52413fb0e32a4fe Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Keep a fractional part of custom baud rate in a debug outputDenis Shienkov2015-12-311-3/+3
| | | | | | Change-Id: I1f7b5436a00dec545f6256d15147abd43f92767b Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Remove the Symbian mentioning from the *.pri fileDenis Shienkov2015-12-161-1/+1
| | | | | | | Because Qt5 does not support Symbian at all. Change-Id: I8d64db664cc54e7e5f27c031dc4c2f91d5a959f6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Do not use settingFromBaudRate() on Windowsv5.6.0-beta1Denis Shienkov2015-12-133-18/+2
| | | | | | | | This function makes sense only on *nix platforms. Change-Id: Ia1d107e1b0d9095f4f20e1aa472798aa0af11f0f Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Use C-style tokens array for query of device name from registryDenis Shienkov2015-12-101-5/+8
| | | | | | | | ... because QStringList it is an overhead in there. Change-Id: Ic5da6243348ee1a934ae2c91707de71fa7e96825 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Use the C-style array of GUID tokensDenis Shienkov2015-12-101-14/+13
| | | | | | | | ... because use QPair and QList it is an overhead. Change-Id: I9ed90f9301ab1fed194890e925c9124e86d3c7dc Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Use pre-defined class/interface devices GUIDsDenis Shienkov2015-12-105-8/+62
| | | | | | | | | | Also is added the test for verification of presence of ntddmodm.h file, which contains GUID_DEVINTERFACE_MODEM definition. In case the compiler has not this file, we define GUID_DEVINTERFACE_MODEM himself. Change-Id: I471f76f8eabd2a200702a0970aa538c780208e18 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Doc: corrected issue QSerialPort baud rateNico Vertriest2015-12-031-2/+2
| | | | | | Task-number: QTBUG-44994 Change-Id: Id14aaa87bc648e9b775594749eaa2d6a1defdf73 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Fix build on Android x86Eskil Abrahamsen Blomfeldt2015-11-061-0/+2
| | | | | | | | | | | | | In the Android x86 NDK, the termios2 struct is already defined. On ARM, it isn't defined until android-21, which is not what we build against by default. We should probably look for a more robust solution to this, to support platforms where this is defined, but for now the main issue is fixing the build. Change-Id: I6084a90f664f9f778e6d1689106a3fb9a7ad0b2f Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-211-1/+1
| | | | | | | | | | | | The examplesinstallpath variable in .qdocconf files defines the path under QT_INSTALL_EXAMPLES where examples are found. To match the way examples are packaged in Qt 5.6, prefix the install path with the repository name. Task-number: QTBUG-48736 Change-Id: Ib1fa6c707a342c3bbbaf1ad985edd4189b93e048 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Do not use deprecated Q_OS_MAC macroDenis Shienkov2015-10-153-6/+6
| | | | | | | | | | | We need to use the Q_OS_OSX macro instead, because Q_OS_MAC is deprecated and also includes iOS, which we do not support. Besides, the *_mac file is renamed into *_osx. Change-Id: Id8a55f4d159e6a301f508cfce37ae5e39a0b9b2a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Doc: minor link issueNico Vertriest2015-10-131-2/+2
| | | | | | Change-Id: I3dc7dcd60e66b36f0e9913760e80df798e52da80 Task-number: QTBUG-43810 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Use qt_subtract_from_timeout() to reduce a code duplicationDenis Shienkov2015-10-105-18/+10
| | | | | | | | | | Commit qtbase/ed0c0070f9b05c647019270dfc42073d071c830a introduces a new helper function qt_subtract_from_timeout() which can be used to reduce a code duplication. Change-Id: I5c4941360f524225c14eac8c308fb16a546c802f Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Refactor QSPI code on WindowsDenis Shienkov2015-10-061-40/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | Current approach with passing of the array's data pointer to a Win API functions when the array is empty has potential danger. Because the data pointer is invalid, and if a Win API function tries to get access to this pointer then this can cause a crash or an UB. Still this does not happens, but nobody guarantees that this will be same in future. It is better to pre-allocate the array with some size (e.g. with the MAX_PATH size). In this case we can pass the data pointer without any problem. Besides, the Win API functions will return result with the first pass if the array size is sufficient; otherwise it returns ERROR_MORE_DATA error code and we can re-allocate the array with required size and to return a result in the second pass. We re-allocate the array with size more than required on some bytes with filling of the array with zeros. This allows us to convert it using QString::fromWCharArray() without specifying a size, and to remove the toStringAndTrimNullCharacter() function. Change-Id: I5976485286db4097514ea7b3a8adfc9a6a7cea4f Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Remove unused QSPP::baudRateFromSetting() methodDenis Shienkov2015-10-064-24/+0
| | | | | | Change-Id: Ida5f8f8b3374d52b6e20e560aff97cbdc1fe8776 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Use the qt_safe_select for waitForXX functions on *nixDenis Shienkov2015-10-051-3/+3
| | | | | | | | | | | | Now it is used the qt_safe_select() function similar to the Qt socket engine. Tested on Linux (kernel 4.1.7) with the USB and virtual tty0tty serial ports. Change-Id: Icd7a443ee5e0b5d6453a6e9973930f41e1313eeb Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-021-0/+41
|\ | | | | | | | | | | | | | | Conflicts: src/serialport/qserialport_win.cpp src/serialport/qserialport_wince.cpp Change-Id: I6933b53304cf842f452404c9fac487ec6191916d
| * Add changelog for Qt 5.5.1v5.5.15.5.15.5Denis Shienkov2015-09-171-0/+41
| | | | | | | | | | Change-Id: I2712cb9157378805c7d4116c566f3188ec06bd66 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * Fix the typo for the ParityError detection on WindowsDenis Shienkov2015-09-022-2/+2
| | | | | | | | | | | | | | | | Commit a2758cf594dd08a21037873f64f72166a353aa29 introduced a typo when the ParityError never will be detected. Change-Id: I2e4948fab52ae9b9de482b15ecb630f1648c9978 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
View Lorry Controller Status