summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.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.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.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.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
* | | 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.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.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.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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 08:45:28 +0000