| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The '\meta category' command was used for tagging examples with a
specific category, used in Qt Creators Welcome mode.
As we want to also generate lists of examples belonging to a category
elsewhere in the documentation, replace the command with a macro that
expands to the original \meta command and also adds the example to
a group using the \ingroup command. This way, the category names can
be used as arguments to the \generatelist or \annotatedlist commands.
Task-number: QTBUG-112731
Change-Id: Ib1b2ea3b93e0a24d365a822965fe512851568a6a
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit 0c45f0423d573687917f2093e7c1d87a4bf17aa7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Extend the example description so that it actually highlights the main
features shown in the example.
Also update the example to match the guidelines:
* Do not use Example in the name
* Update screenshot
* add Connectivity category
Task-number: QTBUG-110890
Change-Id: Ia406b974967eaa2f5af9b935c4aac6d09253a9ee
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit b3d43080e17b7bdd8b7e2fe7a2d1fcf1ac4b54ab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Disable address&port line edit when the connection is established.
* Add a tooltip for the expected contents of the address & port edit.
* Update default TCP port to 50200 so that it does not require ROOT
privileges on Linux.
* Update MainWindow title
Task-number: QTBUG-110890
Change-Id: I92a08a693b20510a260b4a09bfcdd68a4f6042a2
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit db59ba7847dd3784f9712c903852f3df0c5beeab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Extend the example description so that it actually highlights the main
features shown in the example.
Also update the example to match the guidelines:
* Do not use Example in the name
* Update screenshot
* add Connectivity category
Task-number: QTBUG-110890
Change-Id: I4eb7603630a9b69fff4cf921b5adff6ea4c125cf
Reviewed-by: André Hartmann <aha_1980@gmx.de>
(cherry picked from commit e448b2b4d402c7ef4c8b06d16a8307e5219b115a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Disable connection type combobox, port line edit and server address
spinbox when the connection is established.
* Add a tooltip for the expected contents of port line edit.
* Update default TCP port to 50200 so that it does not require ROOT
privileges on Linux.
* Use QSerialPortInfo::availablePorts() to fill a default port name
for serial connection.
Task-number: QTBUG-110890
Change-Id: I547d098bb38be11b4188ad129ba2a2d75aeac376
Reviewed-by: André Hartmann <aha_1980@gmx.de>
(cherry picked from commit 81c4145f51951dab3a1472a6209f626a8ca4aee2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In line
ok = modbusDevice->setData(..., value.toUShort(&ok, 16));
the value of 'ok' variable after the toUShort() conversion is
immediately overwritten by the return value of setData() method.
As a result, the code could never detect that toUShort() conversion
failed.
This commit splits the line into several independent statements, adding
an if (ok) check in between.
Task-number: QTBUG-110890
Change-Id: I98a9275262f5a05fee77905ce7c7d861f2dce6fe
Reviewed-by: André Hartmann <aha_1980@gmx.de>
(cherry picked from commit 65349283e32a5a0f0bf99469d9e596212a88e623)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Extend the example description so that it actually highlights the main
features shown in the example.
Also update the example to match the guidelines:
* Do not use Example in the name
* Update screenshot
* add Connectivity category
Task-number: QTBUG-110890
Change-Id: I2296371e93b7427db960081ac10efac8deae15af
Reviewed-by: André Hartmann <aha_1980@gmx.de>
(cherry picked from commit 20d4cba63221cb144537518e492187ff82a590fa)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Disable connection type combobox, port line edit and server address
spinbox when the connection is established.
* Add a tooltip for the expected contents of port line edit.
* Update default TCP port to 50200 so that it does not require ROOT
privileges on Linux.
* Use QSerialPortInfo::availablePorts() to fill a default port name
for serial connection.
Task-number: QTBUG-110890
Change-Id: I534955726da468da9213cff8b43ae0603afe0036
Reviewed-by: André Hartmann <aha_1980@gmx.de>
(cherry picked from commit 3287a82b4afe618144e257ab6dbe06fc34628aab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Extend the documentation so that it actually highlights the main
features shown by the example.
Also update the documentation to match the guidelines:
* update screenshot
* add Connectivity category
Task-number: QTBUG-110890
Change-Id: I9c75488440be23885c7751f6d00018e9537cdfa2
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit be1a4f7e32503a9de156a454ccd9c6e99f79e4a9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Use qt_standard_project_setup() instead of enabling AUTOMOC and
AUTOUIC manually
* Use PRIVATE linkage
* Use versionless CMake functions
Task-number: QTBUG-110890
Change-Id: I45fb142c99b71591c883a7c5ce61a6375faec4e7
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 0ac11c92929449cd77c9e867be329bf56eba8d94)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Use qt_standard_project_setup() instead of enabling AUTOMOC and
AUTOUIC manually
* Use PRIVATE linkage
* Use versionless CMake functions
Task-number: QTBUG-110890
Change-Id: Iecbc59c1dd9950de649f0694b66de4568131afab
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 29b08dfb07b4ef72804f67ec38193aa4a1ea6b7a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Change title to "CAN Manager" (to avoid using "Example" in the name)
* Rename "Received CAN messages" -> "Received CAN frames"
* Rename "CAN-ID" -> "Frame ID" in the received frames table
* Rename "Data" -> "Payload" in the received frames table
* Show Frame ID uppercase in the received frames table
* Stretch the "Payload" section to take the rest of the available width
Task-number: QTBUG-110890
Change-Id: Iea57246f45918d69bb11fff78b30952e447e87b2
Reviewed-by: André Hartmann <aha_1980@gmx.de>
(cherry picked from commit 2c1ff70cd1960fe582f461207424c26a4bbe5b9b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
... so that the column name actually fits into it.
Task-number: QTBUG-110890
Change-Id: Idc88f4fa0064bd52331a9142ba99c42af7429057
Reviewed-by: André Hartmann <aha_1980@gmx.de>
(cherry picked from commit c05f843230069cb4b1670ee0e7efd88fcb1cb54b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-110890
Change-Id: If743fc5dff7686eed4941bc68d0c4104f185f46c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
(cherry picked from commit 52a1d4a86557d47a74da034df652441644c5a759)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Fixes: QTBUG-109940
Change-Id: I477d0da422ff2f3a35a035620b93d44112f4c802
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit cc12e9055ab97332a3709440458a881cb6147af3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Fix the settings organization
- Use modern string literals
- Avoid repeated instantiations of QRegularExpression
- Streamline code
Pick-to: 6.4
Change-Id: Id8412d9d21e0969ef4ef4606ce0c024a8803b314
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Use modern string literals
- Use QCommandLineParser to switch on verbose mode
- Fix translated texts with arguments
- Streamline some code
- Remove unused member variable
- Use QVariant casts
Pick-to: 6.4
Change-Id: Ie3bdaa82856bfe8df020dc289de9177d098f02d3
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
|
|
|
|
|
|
|
|
|
| |
- Fix the documentation URL
- Fix clazy warnings about multi-arg
Pick-to: 6.4 6.2
Change-Id: I86589b8b57c467624ba78e81b4d099834460149d
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We've been requiring C++17 since Qt 6.0, and our qAsConst use finally
starts to bother us (QTBUG-99313), so time to port away from it
now.
Since qAsConst has exactly the same semantics as std::as_const (down
to rvalue treatment, constexpr'ness and noexcept'ness), there's really
nothing more to it than a global search-and-replace.
Task-number: QTBUG-99313
Change-Id: I805f044a494f0ed3066c9c132767d541108c0e2d
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
For some reason the connectiondialog.ui form created a layout for a
custom CanBusDeviceInfoBox dialog. However this dialog already has its
own layout, so the layout created by ConnectionDialog was just hanging
around without being added to any class hierarchy, which resulted in a
memleak, as reported by ASAN.
Change-Id: Id77b06069a0c77799e6a856932eadee2d7312b39
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-105718
Change-Id: Ibfa4f2f7788f83b7032406de634ca4fb635d2131
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
CMakeLists.txt and .cmake files of significant size
(more than 2 lines according to our check in tst_license.pl)
now have the copyright and license header.
Existing copyright statements remain intact
Task-number: QTBUG-88621
Change-Id: I4702aec49e940c3a480b94cf8622155b9b688b9e
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.
Pick-to: 6.4
Task-number: QTBUG-67283
Change-Id: Ie17b09db5a4aa7bb0d33906360f1125e9632425c
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Remove "# generated from xyz.pro" comment from pro2cmake
- Remove automatic use of CMAKE_AUTORCC
- Only opt into CMAKE_AUTOUIC if .ui files are involved
- Remove explicit setting of CMAKE_INCLUDE_CURRENT_DIR where
not necessary
- Combine multiple find_package(Qt6 ... calls)
- use REQUIRED COMPONENTS
- sort components alphabetically
- Fix wrong indentations
- Use (only) one empty line after multi-line commands
Pick-to: 6.3
Change-Id: I66b7edaf699db528ed91f738a009aaa2423e3d80
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
qt_examples_build_begin needs the EXTERNAL_BUILD flag
to know that it's safe to build examples as ExternalProjects.
It still won't do it in CI until we enable building
examples as ExternalProjects for prefix builds.
This is preparation for that.
Pick-to: 6.2 6.3
Task-number: QTBUG-90820
Change-Id: I2b774c85e9c895786fb497f4f12735d115f6330a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
|
|
|
|
|
| |
Change-Id: I447a1faff0dae423051c884037c9267696272a6a
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
|
|
|
|
|
|
|
|
| |
receivedframesview.cpp:66:5: Pass a context object
as 3rd connect parameter [clazy-connect-3arg-lambda]
Pick-to: 6.3
Change-Id: I0da8f98b8f3629ca45b51a5b650115538ae3b558
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
|
|
|
|
|
|
|
| |
Pick-to: 6.2
Pick-to: 6.3
Fixes: QTBUG-96566
Change-Id: If1ada6afb9a8679da21d60a9d5b20c2282b07451
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
|
|
|
|
|
|
|
| |
Pick-to: 6.2 6.3
Task-number: QTBUG-90820
Change-Id: Idf2121e678bebac834531e23bf5928c02384ba96
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-91646
Change-Id: I26fea97b7594da1f85f72c4f08cb88958fccb476
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
|
|
|
|
|
| |
Fixes: QTBUG-95801
Change-Id: I3ec19aae58b42450470000e6380c5d41422bd034
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
|
|
|
|
|
|
| |
Pick-to: 6.2
Task-number: QTBUG-95636
Change-Id: I821f412f9dbe11ae99ffd888a7ab2ba415ed9379
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A previous change added an explicit link dependency to the examples
without searching for the package first.
Amends 4a2828a3d30fa1e4760a6778b8b58569caefb632
Pick-to: 6.2
Task-number: QTBUG-86533
Fixes: QTBUG-95387
Change-Id: I6d5fb5d3d62acc877e096951e0a6d70b5d63baa8
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
As example for the new function QCanBusDevice::deviceInfo().
Therefore, extract the group box containing the information
from the connect dialog and re-use it for the new CAN device
information dialog.
Change-Id: I1fd5f9b630a24c819c1fd77a4e2c05542dc15378
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is to ensure that the pre-existing QtNetwork library from the
b2qt SDK sysroot in the CI is not picked up.
This is likely a consequence of CMake not adding an -rpath-link flag
when linking. See QTBUG-86533 for details.
Task-number: QTBUG-86533
Pick-to: 6.2
Change-Id: Id05d49812f957c8a6c12c03f5ff633015bd63103
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
|
|
|
|
| |
Fixes: QTBUG-73743
Change-Id: I49f71488a80cc008bdcfda9c478a956b4151c2e3
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
|
|
|
|
|
|
|
|
|
| |
The signal got removed long time ago but stayed unoticed in the
example cause of the use of the SIGNAL/ SLOT macro.
Change-Id: I632a03eecb508ec38b86955809e700aba187f000
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
|
|
|
|
|
|
|
|
| |
Insert a space after every byte (two hex digits) even when editing
the string in the middle.
Task-number: QTBUG-91251
Change-Id: I477c9116c74c8ff52902222ab855d331e3d78b13
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
|
|
|
|
|
|
|
|
|
|
| |
Add a class based on QAbstractTableModel to show the received frames.
Also add a configurable queue to buffer the frames before displaying
them. This should avoid frames loss in flood traffic mode.
Task-number: QTBUG-85611
Change-Id: Iac4671096c1cbfdc8297acf3c99be960b7eaf010
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
|
|
|
|
| |
Change-Id: Ide7505ebf0184978cf8973e863efa16f01e230b6
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
|
|
|
|
|
|
|
|
| |
Fixes: QTBUG-91211
Change-Id: I38dc720402f0b1a9806ce39c31dbbd52f7d66aa6
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Since our public nor private API can be modified in a way to keep
the application working, and, since we need to have such an app to
generate invalid and/or illigal frames to test the error handling
of the Modbus server, move the example into manual tests.
Fixes: QTBUG-55270
Change-Id: I1bc541f19f7327833cc74e9b80065b236969dc3c
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-91213
Change-Id: I0ca8f4d87fd356966a449675c7c18bc70f7c92dc
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-91213
Task-number: QTBUG-91212
Task-number: QTBUG-91211
Change-Id: I2b585d73b5fa3194459709fa57d44a8f42dceeed
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
This change follows the recommendation announced by the Modbus
organization in the press release of July 9th, 2020.
Task-number: QTBUG-91213
Change-Id: Id946eea900b620a7f021caa30ae40e3f0b0c3dc4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-91212
Change-Id: I5df9e33186acb5216335ec1010f6694bcbab9376
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
| |
Change-Id: Ied9bcecc57838f41ba4435afdc995dc5194c0681
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
|
|
|
|
|
|
|
|
|
| |
[ChangeLog][CAN Example]
Fixed a crash in the payload hex editor when deleting characters in the middle.
Fixes: QTBUG-90783
Change-Id: I95d1f1826c6d19195c2538b6adf214a9d9d5f47f
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
|
|
|
|
|
|
|
|
| |
warning: Pass a context object as 3rd connect parameter
[clazy-connect-3arg-lambda]
Change-Id: I39b85204eeb2584d3f39ba28592b76d0b69465a6
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-90399
Change-Id: I0521231e7d61809f38c44215b5cd923b292b9e02
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|