summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Bump versionKari Oikarinen2019-02-251-1/+1
| | | | | | | | | | | | Change-Id: Ic771210f87829d54ef9b37e7279aa2482b39d16d
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-054-3/+4682
|\ \ \ | |/ / | | | | | | Change-Id: I10e019e7f9a2439202c9427e1e91d19179e51a14
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1v5.13.0-alpha1Qt Forward Merge Bot2019-02-024-3/+4682
| |\ \ |/ / / | | _ | | Change-Id: I3931aca16393acc9c698dcf018801e1d031004bc
| * 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>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-220-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I539dddcfd88712d35c47e4f5f06ab6e94ba47e99
| * | | Bump versionKari Oikarinen2019-01-141-1/+1
| | |/ | |/| | | | | | | Change-Id: If3d10ac91b70b1f6cd9431c8beec47d33fff35e7
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-100-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I36b638e386542b052cb58ceff1ff16f97f47a469
| * | Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | | | | | Change-Id: I9c9a4a7447db206adad82eaed72ce873d8ae44f6
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-151-0/+20
|\ \ \ | |/ / | | | | | | Change-Id: I5c9b44dbe1b1083d21e1e4baaa9b10dc0d3178a7
| * | 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' into devQt Forward Merge Bot2018-12-081-0/+18
|\ \ \ | |/ / | | | | | | Change-Id: I55d11e68bcbeabfa89d7ccab267f13fe07ffd7d6
| * | 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>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-241-1/+1
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I35bc56c0e1bc2efa96c86c7a0a33322e72a4fdd9
| * | | 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.12' into devQt Forward Merge Bot2018-11-170-0/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ie2d9c5bb5d0fedffe361dd958718ac02505b0cc6
| * | | 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
* | | Add initial configure.jsonAlex Blasche2018-10-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file is required to introduce the qtserialport module to Qt's configuration system. Ultimately this will be used to correctly handle configure dependencies for qtserialbus. Task-number: QTBUG-70360 Change-Id: I53e2c0c06b0b4fa9acacfc91d597aa6830904d20 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | | | | | | | | | Change-Id: Iea3ec7802aeea2788edc6a38d1accb945cc3e487
* | | Fix namespaced buildLiang Qi2018-10-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not allowed to include files within Qt namespace. See 5b99f3a3 in qtbase dev. Change-Id: I21af750ef73dfe3c1191c1e8cc843c3235be3c19 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-291-0/+1
|\ \ \ | |/ / | | | | | | Change-Id: I1448658619df38755799578864f847d70a922c81
| * | 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.12' into devQt Forward Merge Bot2018-09-151-0/+24
|\ \ \ | |/ / | | | | | | Change-Id: I100851112abbdfe4713a55cdd0ca345db95dcabf
| * | 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
View Lorry Controller Status