summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-086-0/+12
|\ \ | |/ | | | | Change-Id: I1b9b5ff33064eab6e35e4fd57b72b8fbf2a5a022
| * 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>
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-0712-36/+27
|\ \ \ | |/ / | | | | | | Change-Id: I35f19a7d266f90e957bfe01534a40c4d98b40b34
| * | 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>
* | | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-156-306/+470
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0dcaa0ea10fa9ca4a04f5c3837ea70028fc9c0b8
| * | 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
* | QSerialPort: Replace select with poll on UnixLouai Al-Khanji2016-02-051-13/+11
| | | | | | | | | | Change-Id: I7228af796b440790862d22026fa99f96881e39c0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Unify license header usage.Antti Kokko2016-02-0235-535/+1130
| | | | | | | | | | | | | | | | | | Updated license headers to use new BSD header instead of LGPL3 one (in those files which will be under BSD) Change-Id: Ifd29dab2fcb32b7f7f37430f59e9dc50d1fc8766 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Unify license header usageAntti Kokko2016-02-024-48/+737
| | | | | | | | | | | | | | | | | | Updated license headers to use new GPL-EXCEPT header instead of LGPL3 one (in those files which will be under GPL 3 with exceptions) Change-Id: I0a5ed401e2060999694063aeecbdb598246629d7 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Unify license header usageAntti Kokko2016-02-0212-58/+58
| | | | | | | | | | | | | | | | Updated FDL license. Change-Id: I1165e025a7f9f3628d0bc25553b48d27384413ca Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Unify license header usageAntti Kokko2016-02-0218-195/+1463
| | | | | | | | | | | | | | | | Update old header.LGPL3 to header.LGPL Change-Id: I1b17b6f798ee521d2e3bd8c37024df7cd65ee0c4 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-2612-87/+103
|\ \ | |/ | | | | Change-Id: Idc590cb4d891d7701cc443be80275c4d9ccfa5a6
| * 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>
* | QSerialPort::atEnd(): remove code duplicationAlex Trotsenko2016-01-212-3/+2
| | | | | | | | | | | | | | These conditions are checked in the base implementation. Change-Id: I4bb010d48c6a581a140ba697f9dc31390d2067d2 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
View Lorry Controller Status