summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
|\ | | | | | | Change-Id: I2e2334e3cc7de559603b8984f5a8f7bf23ee79ec
| * Add changes file for Qt 5.11.1v5.11.15.11.1Antti Kokko2018-06-091-0/+24
|/ | | | | Change-Id: Ia94854716d2b74be79a4276b7e079756f1780228 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Add binary compatibility file for 5.11 for QtSerialportMilla Pohjanheimo2018-06-051-0/+4595
| | | | | | | Binary compatibility file for bic test added. Change-Id: I906859b98d58e7563c7a33134ac8ecc79900470b Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Add changes file for Qt 5.9.6Antti Kokko2018-06-011-0/+24
| | | | | | | Change-Id: I7cc575244a41d49725c0cbf9daf6072298e6d7bc Reviewed-by: André Hartmann <aha_1980@gmx.de> (cherry picked from commit 0a242c49401571d6a5a294935af02c431cc32143) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Add changes file for Qt 5.9.5Antti Kokko2018-06-011-0/+26
| | | | | | | Change-Id: Id20df0c3be05b67e8c78e7a98bc693b14b858306 Reviewed-by: André Hartmann <aha_1980@gmx.de> (cherry picked from commit fa6766b3971728d6388f454531753e86d1e6dc1c) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | Change-Id: Ib0ae1cd5fb834482193606296dbb3d100975455f
* Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+26
|\ | | | | | | Change-Id: I8563ca5f79805633436a1aca21bb734579011766
| * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.05.11.0Antti Kokko2018-04-251-0/+26
|/ | | | | Change-Id: I16d26e5182fc158134f1c03f253a2d70ac67b3fa Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Exclude clang-cl from enum value deprecationFriedemann Kleint2018-04-171-2/+2
| | | | | | | | | | Fixes numerous warnings: unknown pragma ignored [-Wunknown-pragmas] when compiling with clang-cl. Task-number: QTBUG-63512 Change-Id: Idba2ab207d6512e3930ee467b98d4dc73b8aeb25 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Start overlapped I/O notifier before any asynchronous operationv5.11.0-beta4Denis Shienkov2018-04-091-3/+6
| | | | | | | | | | | | | | | | | | This commit d57b9e83857253a1479f89fca18ea5856db39fb7 introduced a regression, where the QSP may ignore all the read events when the data comes to the device within opening. In this case, even re-opening of a device does not help. Reason is that the QWinOverlappedIoNotifier is enabled after than the startAsyncCommunication() called, that probably, leads to ignoring for all EV_RXCHAR events. A workaround is to enable the notifier before than any of I/O operation called. Task-number: QTBUG-67224 Change-Id: I21538fddc4dfd850c600e1d74f3c393a59a00549 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Don't poll for POLLIN event if device is open in WriteOnly on Linuxv5.11.0-beta3v5.11.0-beta2Denis Shienkov2018-03-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Following code snippet: QSerialPort serial("/dev/ttyUSB0"); serial.open(QIODevice::WriteOnly); serial.write("ABCDEF"); serial.waitForBytesWritten(-1); causes an application crash if some of data will be received by the serial port. Reason is that qt_poll_msecs() triggered with POLLIN event, even if the device is opened with O_WRONLY flag. In this case the readNotification() handler is called, which trying to reserve some space from the uninitialized read QRingBuffer, that causes an assertion. Solution is to don't use the POLLIN event if device is open with O_WRONLY flag. Change-Id: I205be31608359f52b5ef286a33dd266ed11a2649 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta1Liang Qi2018-02-180-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I7fd4397a06b77adb9ae6b4f3f47bf5f498725db6
| * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | Change-Id: I29151ab5f41a7f9ef4da23a59bd5bac5c76ca375
* | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+26
|\ \ | | | | | | | | | Change-Id: I82b3e9a925f694549ddf2d5d812076e3c85f604a
| * | Add changes file for Qt 5.10.1v5.10.15.10.1Antti Kokko2018-02-051-0/+26
| | | | | | | | | | | | | | | Change-Id: Ic38b0ef4c15e5a394f21d2faac3604ebee342924 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-201-0/+25
|\ \ \ | |/ / | | | | | | Change-Id: I6fb538b4d99c7df542e6e1b7e2dac2d7282f819f
| * | Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-181-0/+25
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6c16b9513a2cd065c2ea11f01333f1ce00483c36
| | * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+25
| | |\ | | | | | | | | | | | | Change-Id: I459e19923eca24fc8a7dcc059d6f82633b872168
| | | * Add changes file for Qt 5.9.4v5.9.45.9.4Antti Kokko2018-01-081-0/+25
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib631f29d1b06f1a0906ecdccd3d16f2d6e620fad Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * | Fix license headersJani Heikkinen2018-01-066-1693/+38
| | |/ | | | | | | | | | | | | | | | | | | | | | - Replace old header.LGPL21 usage with header.LGPL one - Remove unnecessary license files Change-Id: I3613e00d58634c7f2eb634f305a34b7e4940c569 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | Change-Id: I6a4375892d59dbbd8efd7f833fb8f53ff3fd67db
| | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+25
| | |\ | | | | | | | | | | | | Change-Id: I446d6563802b347a113285e64276f87f677f1c75
* | | \ Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-1614-1694/+4664
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Icf5a1d17d2a9ea612449f2fdbf6903892cbed411
| * | | Fix license headersJani Heikkinen2018-01-156-1693/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old header.LGPL21 was used in some src files.Replace ones in src/ with correct header.LGPL one. Also remove unnecessary license files. Change-Id: I1d752c8361b8b23fcd3232818553da60bbdabfca Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | qtlite: Skip building examples when configured with no-feature-itemviewsRainer Keller2018-01-125-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-53141 Change-Id: I4d54749396ad8981db3649e2eca660ef7e2520cb Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: I83963879b6f0d8a98e9f844d76ec9b7353a692ea
| * | | Add binary compatibility file for QtSerialPort for 5.10Milla Pohjanheimo2017-12-121-0/+4595
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add file to test binary compatibility for 5.10 Change-Id: I7c5a5093c72897f08783c4b4fe534fb03ff83308 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-082-1/+26
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I3ebe2cb613c7c2009e133ed04e8530e157d63226
| | * | | Fix typo in changes file for 5.10.0 versionv5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.05.10.0Denis Shienkov2017-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic7e145b56f4405b5a8663b344ec67c6a90409d91 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| | * | | Merge remote-tracking branch 'origin/5.9.3' into 5.10.0Liang Qi2017-11-211-0/+25
| | |\ \ \ | |/ / / / | | | | _ | | | | Change-Id: Ib8ed5f441ffa1ce26e4659dba4e55b3295a36ead
| | * | 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>
* | | Doc: Resolve 'Cannot tie this documentation to anything' warningTopi Reinio2018-01-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | As QWinOverlappedIoNotifierPrivate is not documented, replace the /*! ... */ comment with a standard C-style comment. Change-Id: I813e62503214fc686b913ccd770fb6e35922baa9 Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | Doc: Move extra comments into the QDoc comment blockTopi Reinio2018-01-121-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | QDoc requires the function body to follow immediately after the /*! ... */ comment. Change-Id: I385bdfe16003e29950352a83ddb13fe75badcc5f Reviewed-by: Martin Smith <martin.smith@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-2044-799/+827
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: examples/serialport/blockingmaster/masterthread.h examples/serialport/blockingslave/slavethread.h Change-Id: I6b6bf25b41ff0f1b0b9632069d3b13f6c47c6421
| * | Add changes file for Qt 5.10.0Antti Kokko2017-11-101-0/+28
| | | | | | | | | | | | | | | Change-Id: I28421e723bec42653618c027b64b38f35c6e0c90 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * | Update include instructions in documentation overview pagesv5.10.0-beta4Andre Hartmann2017-11-032-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | The examples were already adopted to use <QSerialPort> instead <QtSerialPort/QtSerialPort>. Change-Id: Id9d3b0b04f31ac3d32554aa34941696903511577 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-305-2/+58
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/serialport/blockingmaster/masterthread.cpp Change-Id: I3716089bae99247f98ed02656d4418de5f866c1d
| | * 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>
| * | Fix order for some includesv5.10.0-beta3Denis Shienkov2017-10-251-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | Qt includes should be added before platform-specific includes. Change-Id: Ie8bcf306c9e0f3d5d719ee57bcddc8bd2967f5cb Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
| * | Allow more paths for lookup of lock-file directoriesDenis Shienkov2017-10-251-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It makes sense to use the QStandardPaths::writableLocation(QStandardPaths::TempLocation) directory for any of Unix-like platforms, as a 'last resort' to store the lock-files, if no other preferable directory was found. Change-Id: Ifd1a5789c014388509b29837171d3fdc440d63e6 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Make some more d-pointers constDenis Shienkov2017-10-241-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: I844f5102077e7b4d5240947a614bfb163c8b7890 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
| * | Add missed 'explicit' keywordsDenis Shienkov2017-10-241-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: I12da9eb3a57fc312fb4b029714166af10755ca76 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
| * | Revamp the Console Enumerator Examplev5.10.0-beta2Denis Shienkov2017-10-121-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update includes to common style. * Split very long lines. * Remove QT_USE_NAMESPACE macro. * Remove QObject::tr() calls. Task-number: QTBUG-60652 Change-Id: I76105da84b8b89e76b723208600604bca6edd8a5 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
View Lorry Controller Status