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

7 files changed, 7 insertions, 7 deletions

diff --git a/src/tools/canbusutil/canbusutil.cpp b/src/tools/canbusutil/canbusutil.cpp
index f64fc3d..0a0a6df 100644
--- a/src/tools/canbusutil/canbusutil.cpp
+++ b/src/tools/canbusutil/canbusutil.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 tools applications of the QtSerialBus module.
diff --git a/src/tools/canbusutil/canbusutil.h b/src/tools/canbusutil/canbusutil.h
index 8beb967..af1d3af 100644
--- a/src/tools/canbusutil/canbusutil.h
+++ b/src/tools/canbusutil/canbusutil.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 tools applications of the QtSerialBus module.
diff --git a/src/tools/canbusutil/main.cpp b/src/tools/canbusutil/main.cpp
index a5dcb43..1304f22 100644
--- a/src/tools/canbusutil/main.cpp
+++ b/src/tools/canbusutil/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 tools applications of the QtSerialBus module.
diff --git a/src/tools/canbusutil/readtask.cpp b/src/tools/canbusutil/readtask.cpp
index 798c080..fb159b7 100644
--- a/src/tools/canbusutil/readtask.cpp
+++ b/src/tools/canbusutil/readtask.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 tools applications of the QtSerialBus module.
diff --git a/src/tools/canbusutil/readtask.h b/src/tools/canbusutil/readtask.h
index 38a1753..19bc7ad 100644
--- a/src/tools/canbusutil/readtask.h
+++ b/src/tools/canbusutil/readtask.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 tools applications of the QtSerialBus module.
diff --git a/src/tools/canbusutil/sigtermhandler.cpp b/src/tools/canbusutil/sigtermhandler.cpp
index bf6f6ba..8611916 100644
--- a/src/tools/canbusutil/sigtermhandler.cpp
+++ b/src/tools/canbusutil/sigtermhandler.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 tools applications of the QtSerialBus module.
diff --git a/src/tools/canbusutil/sigtermhandler.h b/src/tools/canbusutil/sigtermhandler.h
index b2c09b3..1d72f0a 100644
--- a/src/tools/canbusutil/sigtermhandler.h
+++ b/src/tools/canbusutil/sigtermhandler.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 tools applications of the QtSerialBus module.