summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Regenerate projectswip/cmakeAlexandru Croitor2019-11-1521-40/+169
| | | | | | Change-Id: I67f250ddeeff247effde641ea3059e62fa67971a Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Re-generate CMakeLists.txt after recent pro2cmake.py fixesSimon Hausmann2019-09-202-4/+63
| | | | | | | | The top-level requires() is now translated automatically Change-Id: I2f0640e1e1c8fd4641169f66400488498c144436 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* cmake: Initial CMake build system supportLiang Qi2019-09-1822-0/+563
| | | | | | | | | ntddmodm part need port to configure.json way first. Task-number: QTBUG-78165 Change-Id: I4b2f8102b349a4b77378f0e7dc5b397beb91d92c Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Revert "Re-add dependencies.yaml now that qt5.git wip/qt6 builds fine"wip/qt6Alexandru Croitor2019-08-281-4/+0
| | | | | | | | | | This reverts commit 4b8060abef8292c9e19458df7f99c2868380fe1e. As discussed we shouldn't use the files until we have an easier mechanism for updating in place. Change-Id: I3efac0e3e677f9b9ea4a35f57b50e0ec8353ebca Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Re-add dependencies.yaml now that qt5.git wip/qt6 builds fineAlexandru Croitor2019-08-221-0/+4
| | | | | Change-Id: I0e0548e1fe17bbde9c45dc682600d8839804b9d8 Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
* Fix Qt6 buildAlexandru Croitor2019-08-017-38/+38
| | | | | Change-Id: I6fdfe8b21efe92ba97b7c833997432e670e5937c Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Bump Qt version to Qt 6Alexandru Croitor2019-07-111-1/+1
| | | | | | Change-Id: If8b3351e433555a2686ed59747625c2f3d307502 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* QSerialPort: Port to alertable I/O functions on WindowsDenis Shienkov2019-06-087-637/+418
| | | | | | | | | | | | | | | | | | | | | | This commit removes the QWinOverlappedIoNotifier in favor of alertable I/O functions like {Read|Write}FileEx(). The reason is that the QWinOverlappedIoNotifier is very complex to maintain. To use the alertable functions in the serial port we need an alertable analog of WaitCommEvent function. This function does not exist in the Win32 API, but we implement it trough a set of the system NtXXX and RtlXXX functions, which are resolved dynamically. This patch was tested with auto-tests and the examples using the: * com0com virtual serial port driver. * eltima virtual serial port driver. * pl2303 USB/serial converters. Task-number: QTBUG-74961 Change-Id: Idc428173eee7a1066a4693de00aa38416c4ee86c Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-05-041-1/+2
|\ | | | | | | Change-Id: I28f3368a3120f0dbb53be1bb967b1463baa92576
| * Fix shadow build qtserialbusAlex Blasche2019-04-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtSerialBus requires QtSerialPort for its serial modbus feature. If QtSerialPort is disabled the serial feature in QtSerialBus is disabled. Integrity is one of the platforms where QtSerialPort is not supported and therefore the serial modbus classes are removed. The removal of QtSerialPort is done via qtserialport.pro. Unfortunately during configure execution this project file is not considered. The configure script only considers configure.json files to determine whether a module is built/supported on a particular platform. Consequently the build process fails to build QtSerialBus. The fix is to copy the project conditions to QtSerialPort's configure.json. Fixes: QTBUG-75279 Change-Id: I3796052de6c0622c334218e07ca4eab4134c9302 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-271-0/+20
|\ \ | |/ | | | | Change-Id: Ie36468f0b198077b77b5d8b4150a173f0a10de1c
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-201-0/+20
| |\ | | | | | | | | | Change-Id: I93b15f0febdec555955f37bc59170b3a14036930
| | * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I6a3b3afc9f0438088961656a1e86d63336c7c9fb
| | | * Add changes file for Qt 5.12.3v5.12.35.12.3Antti Kokko2019-04-021-0/+20
| | |/ | | | | | | | | | | | | | | | | | | + 0ab5636aee10d8578307beb90c69e27f7f69574b Bump version Change-Id: Iea046d03e9e1e129736128d04898e92e5dde37a5 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-300-0/+0
|\ \ \ | |/ / | | | | | | Change-Id: Iefb004588927da7d72f8f21f7d7a56ef2cbe65be
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3v5.13.0-beta2Qt Forward Merge Bot2019-03-270-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib7f7ba11d925cbcab3799a276d1b6e2e3a41acb6
| | * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | | | | | Change-Id: Ibe25f8da8e6ad80a355946c621310390e2dda362
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-191-0/+20
|\ \ \ | |/ / | | | | | | Change-Id: I471781e7e5d4b5d14057f867c207a01915d68895
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-161-0/+20
| |\ \ | | |/ | | | | | | Change-Id: I673297d3c6e4ebb183918073fe96a276e8e68a49
| | * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I1550dbe1e932e3ebbe284418a06eb29351f360c8
| | | * 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>
* | | 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>
View Lorry Controller Status