diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-31 20:34:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-31 20:34:15 +0200 |
| commit | 943518be292f929ff49a589eaa39f7de8a2a14a1 (patch) | |
| tree | 4d5ae1f4084b7f5286f11076b4256a6588ae4c4b /src/plugins/canbus/socketcan | |
| parent | 518606690eb1fa021aaecb8e75c6686c4ebea6cf (diff) | |
| parent | 90be9fc65329509229eb17aef74e400fada58da9 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta1
Conflicts:
src/plugins/canbus/canbus.pro
src/plugins/canbus/vectorcan/vectorcanbackend.cpp
Change-Id: I3625693784e88204c93479806242ae70c7ec7ff3
Diffstat (limited to 'src/plugins/canbus/socketcan')
| -rw-r--r-- | src/plugins/canbus/socketcan/main.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/canbus/socketcan/main.cpp b/src/plugins/canbus/socketcan/main.cpp index 8a44c5e..92e759b 100644 --- a/src/plugins/canbus/socketcan/main.cpp +++ b/src/plugins/canbus/socketcan/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtSerialBus module of the Qt Toolkit. diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp index 0244550..930221d 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtSerialBus module of the Qt Toolkit. diff --git a/src/plugins/canbus/socketcan/socketcanbackend.h b/src/plugins/canbus/socketcan/socketcanbackend.h index 3caddd8..70c47c8 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.h +++ b/src/plugins/canbus/socketcan/socketcanbackend.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtSerialBus module of the Qt Toolkit. |