diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:01:17 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:01:17 +0200 |
commit | b64936b0d208bdb0655055dc2b80e1ef74b62628 (patch) | |
tree | fcbe231a6c82968a7180a9b770372584312aceb9 | |
parent | ed04233a1b16c16bc65971c1c47c7fe608479d95 (diff) | |
parent | 38def2c0817291c09c440c074f011c4f684eaccf (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ie1f9924e6377dfafbe5dcf361c7721599d0ac65b
-rw-r--r-- | dist/changes-5.12.5 | 30 | ||||
-rw-r--r-- | dist/changes-5.13.1 | 20 | ||||
-rw-r--r-- | src/tools/canbusutil/main.cpp | 4 | ||||
-rw-r--r-- | src/tools/canbusutil/readtask.cpp | 4 |
4 files changed, 55 insertions, 3 deletions
diff --git a/dist/changes-5.12.5 b/dist/changes-5.12.5 new file mode 100644 index 0000000..828ca9f --- /dev/null +++ b/dist/changes-5.12.5 @@ -0,0 +1,30 @@ +Qt 5.12.5 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.0 through 5.12.4. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.12.5 Changes * +**************************************************************************** + +QtSerialBus +----------- + + - CAN Plugins: + * [QTBUG-76957] Fixed the compiler error "‘SIOCGSTAMP’ was not declared" + in the SocketCAN plugin + diff --git a/dist/changes-5.13.1 b/dist/changes-5.13.1 new file mode 100644 index 0000000..57ebdbe --- /dev/null +++ b/dist/changes-5.13.1 @@ -0,0 +1,20 @@ +Qt 5.13.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.13.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.13 series is binary compatible with the 5.12.x series. +Applications compiled for 5.12 will continue to run with 5.13. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. diff --git a/src/tools/canbusutil/main.cpp b/src/tools/canbusutil/main.cpp index 1277325..cbb7d7f 100644 --- a/src/tools/canbusutil/main.cpp +++ b/src/tools/canbusutil/main.cpp @@ -155,7 +155,9 @@ int main(int argc, char *argv[]) data = args.at(2); } else if (args.size() == 1 && parser.isSet(listDevicesOption)) { return util.printDevices(args.at(0)); - } else if (args.size() != 2) { + } + + if (args.size() < 2 || args.size() > 3) { output << CanBusUtil::tr("Invalid number of arguments (%1 given).").arg(args.size()); output << Qt::endl << Qt::endl << parser.helpText(); return 1; diff --git a/src/tools/canbusutil/readtask.cpp b/src/tools/canbusutil/readtask.cpp index 86dfb73..1b07fe8 100644 --- a/src/tools/canbusutil/readtask.cpp +++ b/src/tools/canbusutil/readtask.cpp @@ -68,13 +68,13 @@ void ReadTask::handleFrames() { QString view; if (m_showTimeStamp) { - view = QString::fromLatin1("%1.%2 ") + view = QStringLiteral("%1.%2 ") .arg(frame.timeStamp().seconds(), 10, 10, QLatin1Char(' ')) .arg(frame.timeStamp().microSeconds() / 100, 4, 10, QLatin1Char('0')); } if (m_showFlags) { - QString flags = QLatin1String("- - - "); + QLatin1String flags("- - - "); if (frame.hasBitrateSwitch()) flags[0] = QLatin1Char('B'); |