summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.13.2v5.13.25.13.25.13Antti Kokko2019-10-181-0/+24
| | | | | | | | | + b1413c11b999aadca302c1b12dd90a12b55a1f12 Add changes file for Qt 5.12.5 + 50372ac8f941a06b30f41624d819c4e5513f6b62 Doc: Fix links to example code + f6b43c36b3839dae54308a6437bbdd99ae9a44de Revert "Emit _q_notify only if there's no notification pending" Change-Id: Id5920707db5d6acf15739f4e27b200af16914cbd Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | Change-Id: I13f6a4529145fca26829ef56d83d4b75ff07a951
* Revert "Emit _q_notify only if there's no notification pending"Denis Shienkov2019-09-091-7/+3
| | | | | | | | | | This reverts commit 85ee2c658a45d2958a54045951d236769640337f. That commit completely breaks the I/O on Windows. Task-number: QTBUG-78086 Change-Id: I9125967d6cb5b1cb4e33d0bad80ee66322e5ccc7 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-081-0/+20
|\
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+20
| |\ |/ / | | | | Change-Id: Ic8f6d2b9bfdd06cee36170ef10b101b3fed7125a
| * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+20
| |\
| | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+20
| | |\ | |/ / | | | | | | Change-Id: If3467f530e07f672eecedaf52752abca125bc3c4
| | * Add changes file for Qt 5.12.5v5.12.55.12.5Antti Kokko2019-08-231-0/+20
| |/ | | | | | | | | | | | | | | + 85ee2c658a45d2958a54045951d236769640337f Emit _q_notify only if there's no notification pending + 9509b6d3ee02c3c4a0b98dc95bc9787a3c514a18 Bump version Change-Id: I28e0b9585b0e5ba0c4ee1be9f968b8c515e23b25 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+20
|\ \
| * \ Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+20
| |\ \ |/ / / | | | | | | Change-Id: Iddfb66a501f63793a56b63ff5d5971dc399968c1
| * | 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>
* | | Doc: Fix links to example codeNico Vertriest2019-08-271-19/+16
|/ / | | | | | | | | | | | | | | - Qdoc doesn't create links to example code anymore - modifying references to example code Change-Id: I7e526b8767f20958b00974c46c3e174ab12d5663 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | 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
View Lorry Controller Status