summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
|\ | | | | | | Change-Id: I5849ef7f3294df10f9e7f148696450018d3d54d5
| * Add changes file for Qt 5.14.2v5.14.25.14.2Antti Kokko2020-03-101-0/+20
|/ | | | | | | + 553b62badf129ab36c1beee844a9b39492479e34 Bump version Change-Id: I49a2ec1059d54677647ace382022380ebe655955 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | Change-Id: I02ecb8eda7dc796dc6dd4ef42b6be28d034ff60c
* Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
|\ | | | | | | Change-Id: Id51a0ba969c3efab9d49debe7d4b963be83efcc3
| * Add changes file for Qt 5.14.1v5.14.15.14.1Antti Kokko2020-01-091-0/+20
|/ | | | | | | | + 994ae316887ca4704d60e22b12fc6b4bea771959 Add binary compatibility file for qtserialport 5.14 branch + 8c4f95e481f564d25f168bc7e6ebf7b0c5cec6fd Bump version Change-Id: I040767cc919095305c60184758199b1486283acf Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionDaniel Smith2019-12-161-1/+1
| | | | Change-Id: I05de6efb416c6b8a3a7aeebc23398eae37dd47f9
* Add binary compatibility file for qtserialport 5.14 branchMilla Pohjanheimo2019-12-161-0/+5069
| | | | | | | BC file built against 5.14.0 added. Change-Id: I5476f81069fea31ac8cfaa2bc0059b4f0d9a73ff Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+22
|\ | | | | | | Change-Id: I502aa1e91865aaf3e48cb32f6a6b2b171a8902ce
| * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.05.14.0Antti Kokko2019-12-021-0/+22
|/ | | | | Change-Id: I3bcdf652b9e566dde2c0411bac738c2404d026fb Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Doc: Fix documentation warningsTopi Reinio2019-11-112-1/+3
| | | | | | | | | | | | | | The header file for QWinOverlappedIoNotifier is not available when building on non-Windows platform - as the class is \internal anyway, suppress the Clang-parser warnings by marking also the member functions as \internal. Remove a link to example file page terminal/console.cpp, as QDoc no longer treats these files as linkable targets. Fixes: QTBUG-79809 Change-Id: Ic3bc33c1c27bc234513fe6977877116ed16c22eb Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+24
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I73cc3d9c4a38e6c586ac0c2f54c94184d65c560a
| * 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
* | Remove excess module conditionv5.14.0-beta2Joerg Bornemann2019-10-151-1/+0
| | | | | | | | | | | | | | | | That condition overwrites the actual condition at the top of the file. Fixes: QTBUG-79208 Change-Id: I70905ed693b30b6aa15b29bbf42acf33d9df2b35 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Avoid possible symbol clashes on static builds on Windowsv5.14.0-beta1Denis Shienkov2019-09-252-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | We have same 'resolveSymbols' functions names in the global namespace as in the qtserialport module and as in the qtserialbus module. This can lead to the arbitrary call of this function from a different module that can lead to the crash or other issue (e.g. to this issue QTBUG-78546). So, we can just to rename this function that solves this issue in the future. Change-Id: I25f9d2a33c6858c5194d8c76eefd518eecfb6f7b Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Port ntddmodm config test to new configure systemv5.14.0-alpha1Liang Qi2019-09-184-53/+45
| | | | | | | | | | | | | | Change-Id: Ib8c633534df0cf025b8d9845de6322b8285e73c1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-09-173-7/+43
|\ \
| * \ Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-173-7/+43
| |\ \ |/ / / | | _ | | Change-Id: I946c7c1cfb6b34e15f21f83e7a3ce01f34874839
| * 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>
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-08-281-19/+16
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-08-281-19/+16
| |\ \ \ \ |/ / / / / | | _ / / | | / / Change-Id: Id08dc211c8e10828dfca5d9b3dd2d36fe923a1cc
| * | | 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>
* | | Mark QSerialPortInfo::isBusy as obsolete/deprecated in the docsAlex Blasche2019-08-061-0/+1
| | | | | | | | | | | | | | | | | | Change-Id: I007eb08f66a17d6e8ba200dc2e4e0529ba696ffa Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | | Remove usages of deprecated APIsSona Kurazyan2019-08-055-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed the build with disabled deprecated APIs. - Made the docs for deprecated APIs to compile conditionally, based on the deprecation version. Task-number: QTBUG-76491 Change-Id: I38fbd84254d3d35b2bc208994c9fd70142450ad8 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-226-2/+5508
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-226-2/+5508
| |\ \ \ |/ / / / | | _ / | | / | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0f003a4aef121836be3ed7f1b82e23321fdfe884
| * | 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>
View Lorry Controller Status