summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.13.1v5.13.15.13.1Antti Kokko2019-07-311-0/+20
| | | | | Change-Id: Ie729f172439c4b48458de0a1829c8017f649470f Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-112-3/+32
|\
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-112-3/+32
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5ce880f305ebb0af7f7803769cecf2c899bede12
| | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: I4bbf5180086cfa7c607448e0896c0a73be7764c9
| | * Emit _q_notify only if there's no notification pendingJoerg Bornemann2019-07-011-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the waitXXX functions in a loop, many _q_notify signals are emitted. They are connection via Qt::QueuedConnection, but the event loop never gets the chance to process them. Introduce a counter to count the attempts to send a notification, but only send it once. Fixes: QTBUG-74961 Change-Id: I0ee4522db63844bdd37169d3a31bde2d6f92f383 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| | * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+26
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+26
| | | |\ | | |/ / | | | | | | | | Change-Id: Ib3b937b770b3c6510104fb031f8616bb2602bd63
| | | * Add changes file for Qt 5.12.4v5.12.45.12.4Antti Kokko2019-06-031-0/+25
| | | | | | | | | | | | | | | | | | | | Change-Id: If8b47a6ab57b14c025ceec571ed0c372df147ae3 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| | | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| | |/ | | | | | | | | | Change-Id: If9f3855e0d8451962bb05749a39c3cdfc3d0f148
* | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
|/ / | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I5a468676a2dd9dd44aa80d39a614b06acb0aed81 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | Change-Id: Ica2fabcb8235436943bd83f9b4997f895851df7a
* | Binary compatibility file added for Qt5.13.0 for QtSerialPortMilla Pohjanheimo2019-07-011-0/+5030
| | | | | | | | | | | | | | BC file added. Change-Id: I3a392ff9ced725136d7488dbd43e52a274777308 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+18
|\ \
| * \ Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+18
| |\ \ |/ / / | | | | | | Change-Id: Ie3443035dfc87c95feb8f31da50a89eba83230d5
| * | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.05.13.0Antti Kokko2019-05-081-0/+18
| | | | | | | | | | | | | | | Change-Id: I4681c68927dad3196a76bb49c7e8288b5b6d0552 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-111-2/+10
|\ \ \ | |/ / |/| / | |/ Change-Id: I3d5718006e8fee8fa3c2f97aec03183a4db1aa7c
| * QSerialPortInfo: Fix enumeration of 'Gadget' serial devices on LinuxDenis Shienkov2019-05-071-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'gadget' serial devices have no parent nodes and were skipped from enumeration. We need to check the names of these devices against the 'ttyGS' prefix and then add matching devices to the enumeration. [ChangeLog] Fixed enumeration of 'Gadget' (/dev/ttyGS*) serial devices on Linux. Change-Id: I88afd80358153795152c1b2c929ca5bfb3adbabb Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | 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.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.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.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>
* | 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
View Lorry Controller Status