summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.12.2v5.12.25.12.2Antti Kokko2019-02-211-0/+20
| | | | | | | | + 1f1fa990f8d16625d2c6a65aea58a010495cbc77 Bump version + 8c4dc36b875ab990454faa9c044e1355ddf6646c Android: Enable building again with the supported NDK version Change-Id: Ia6d846abe6bb79c0c5fd5a449916fab373d285e1 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-012-0/+4680
|\ | | | | | | Change-Id: Iec307326926058f9de5897fd1b056006a3194b31
| * Add changes file for Qt 5.12.1v5.12.15.12.1Antti Kokko2019-01-091-0/+20
| | | | | | | | | | | | | | | | | | | | | | + 74222a0e38687068970c8492d794cf92b898c6b6 Bump version + 5e3f1365813079f1a9a9af284b6a40bd9df8e1c0 Add changes file for Qt 5.11.3 + 4114f45fa8f4863a91c37ee06e93275d8b416853 Remove wince check as it is not supported + db95e45174f6c2b3ec664d352f99cffffa5f3908 Add binary compatibility file for QtSerialPort for Qt 5.12 + f7580fc30b4ed060b5075be6592c5c0703d40c53 Bump version Change-Id: If608c934b845918a8fd64043d3c02dd1daf0fe67 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-082-1/+21
| |\ | | | | | | | | | Change-Id: Iad01290b6efe468e4d72877110cbdbefb2707448
| * | Add binary compatibility file for QtSerialPort for Qt 5.12Milla Pohjanheimo2018-12-181-0/+4660
| | | | | | | | | | | | | | | | | | | | | Binary compatibility file added. Change-Id: I7ce81f8ae162f33518a2c443808f57b471290c26 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | | Android: Enable building again with the supported NDK versionAndy Shaw2019-01-232-3/+2
| | | | | | | | | | | | | | | Change-Id: I9cf8c41c4fb37728154bc0cd74124a549b00e3ff Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Bump versionKari Oikarinen2019-01-141-1/+1
| |/ |/| | | | | Change-Id: If3d10ac91b70b1f6cd9431c8beec47d33fff35e7
* | Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: I9c9a4a7447db206adad82eaed72ce873d8ae44f6
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
|\ \ | |/ |/| | | Change-Id: Idb5d307b23093fb3a37e623c70883c29a9ff6c13
| * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| |\ | | | | | | | | | Change-Id: I2f3274867731b1397e878db8104b937893a7a470
| | * Add changes file for Qt 5.11.3v5.11.35.11.3Antti Kokko2018-11-161-0/+20
| |/ | | | | | | | | | | | | + 74222a0e38687068970c8492d794cf92b898c6b6 Bump version Change-Id: Ibebe9892fabd65e60865c259899a6091fb06b225 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+18
|\ \ | | | | | | | | | Change-Id: Idc53c85f97af601a5104019ef60c17c36d3fbe0b
| * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0-beta4v5.12.05.12.0Antti Kokko2018-10-311-0/+18
| | | | | | | | | | | | | | | Change-Id: I3fdfdde797c17ec04db36da6805b1c57fcd90a29 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | | Remove wince check as it is not supportedOliver Wolff2018-11-221-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ie4f4239368e292cfbd7e36456c7c1d638d404077 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: .qmake.conf Change-Id: I16ce61d440f0435a0c6b9fd47fa3a99b331ce4a5
| * Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | Change-Id: Iface560d0320e120910050e1fbcb5c3bc18451f3
* | Disable module on WebAssemblyv5.12.0-beta3v5.12.0-beta2v5.12.0-beta1Eskil Abrahamsen Blomfeldt2018-09-271-0/+1
| | | | | | | | | | | | | | | | | | This does not compile on WebAssembly and does not really make much sense there, since the serial port is not accessible from the browser sandbox. Change-Id: I290fd89e4e97be134de3c26391e2f54a57062299 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
|\ \ | |/ | | | | Change-Id: I185070bd5947b7f3f0249c8a92c74a41a50e0fea
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\ | | | | | | | | | Change-Id: Iac4be2fabd274743c055f9aa06459b2312f13fef
| | * Add changes file for Qt 5.11.2v5.11.25.11.2Antti Kokko2018-08-291-0/+24
| |/ | | | | | | | | Change-Id: I8b37076038549cb86c4899934d20c3241b34d13b Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-08-071-43/+43
|\ \ | |/ | | | | Change-Id: I93cb5c1b2deb59473af0f094c3f89f7476c7d24d
| * Update LICENSE.FDLSamuli Piippo2018-08-011-43/+43
| | | | | | | | | | | | | | | | | | The license file was slight differently formatted from what is used in all the other Qt modules. Update so that files' checksums match across all modules. Change-Id: I4fcedde7b792767535855df06383f667a21f3316 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Skip qtserialport in Android buildsTony Sarajärvi2018-08-021-0/+1
| | | | | | | | | | | | | | | | Qtserialport won't work without rooted Androids anyways. Task-number: QTBUG-69727 Change-Id: I9a14a8e880d8e238a7f75ce12ca805c5af476407 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I64a34dbb92729cb7b6b717c2930da60da89df8f4
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: I6ad70900c7af5871f494dd9acc6ab03fd6127661
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-231-0/+24
|\ \ | |/ | | | | Change-Id: Ia456751b418b68ec2818f1034d2eb84f687f4023
| * 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>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-121-0/+4595
|\ \ | |/ | | | | Change-Id: I67ccaf2aa01202332dbb62256d35d7c10c2a2000
| * 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>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-042-0/+50
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6e39a9466c0364f358f6a1dcdd0420228501879e
| * 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
* | Remove LGPL_EXCEPTION.txtEdward Welbourne2018-05-311-22/+0
| | | | | | | | | | | | | | | | It became obsolete when we switched to LGPL3, as discussed on the developer mailing list in April 2017. Change-Id: I8bb96f9228e4ab6a3afdd72a62debd88d7af88b7 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+26
|\ \ | |/ | | | | Change-Id: I159b0cf12d09cdcfb0261c70a30e7b0adfd4ec27
| * 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>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-211-2/+2
|\ \ | |/ | | | | Change-Id: I95b61b3a3ee49cdab0982c11fb0fcf04476f0c64
| * 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>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-101-3/+6
|\ \ | |/ | | | | Change-Id: I00feb61aa056d72bb0b3bedd13991c585303a0db
| * 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>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-061-1/+2
|\ \ | |/ | | | | Change-Id: I0727645adb5ce90084de230ecf03af80854aaeb4
| * 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.11' into devQt Forward Merge Bot2018-02-271-0/+26
|\ \ | |/ | | | | Change-Id: I997417dd0a95d13c1dd43a3aa13665fdd7a383d5
| * 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>
* | | | Bump versionOswald Buddenhagen2018-02-191-1/+1
|/ / / | | | | | | | | | Change-Id: I6cf2fe5a4ef7ad14a24dcc603272b3497cf6a67a
View Lorry Controller Status