diff options
author | Andre Hartmann <aha_1980@gmx.de> | 2016-09-01 22:57:01 +0200 |
---|---|---|
committer | André Hartmann <aha_1980@gmx.de> | 2016-09-05 15:22:40 +0000 |
commit | 26c0d9329d5d12c37459b08f9bddc1861211e98a (patch) | |
tree | 28d066216536eca5851f3d43586934a88ea2729e /examples/serialbus/can/mainwindow.ui | |
parent | 063724d23800dd3f2526487f603c4d42dafc175e (diff) |
CAN-Example: Fix long timestamp formatting
SocketCAN gives timestamp in UNIX format, which looks like this after
formatting: "1472763249.2678". Adjust the header bar and the format
specifier to cover this case and shorter formats also.
Change-Id: Ib95f831f02a5e0434ec776c4611b2decd6abb77a
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'examples/serialbus/can/mainwindow.ui')
-rw-r--r-- | examples/serialbus/can/mainwindow.ui | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/serialbus/can/mainwindow.ui b/examples/serialbus/can/mainwindow.ui index adacbd7..4a3fcf9 100644 --- a/examples/serialbus/can/mainwindow.ui +++ b/examples/serialbus/can/mainwindow.ui @@ -143,7 +143,7 @@ Otherwise, the standard format with 11 bit idenfier is used.</string> <enum>QFrame::StyledPanel</enum> </property> <property name="text"> - <string>Timestamp CAN-ID DLC Data</string> + <string>Timestamp CAN-ID DLC Data</string> </property> </widget> </item> |