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 /examples/serialbus/modbus/adueditor | |
| 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 'examples/serialbus/modbus/adueditor')
7 files changed, 7 insertions, 7 deletions
diff --git a/examples/serialbus/modbus/adueditor/main.cpp b/examples/serialbus/modbus/adueditor/main.cpp index 1f3a7c8..24e862e 100644 --- a/examples/serialbus/modbus/adueditor/main.cpp +++ b/examples/serialbus/modbus/adueditor/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 examples of the QtSerialBus module. diff --git a/examples/serialbus/modbus/adueditor/mainwindow.cpp b/examples/serialbus/modbus/adueditor/mainwindow.cpp index a01e5c7..60a5448 100644 --- a/examples/serialbus/modbus/adueditor/mainwindow.cpp +++ b/examples/serialbus/modbus/adueditor/mainwindow.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 examples of the QtSerialBus module. diff --git a/examples/serialbus/modbus/adueditor/mainwindow.h b/examples/serialbus/modbus/adueditor/mainwindow.h index 4e229b5..0d8fb27 100644 --- a/examples/serialbus/modbus/adueditor/mainwindow.h +++ b/examples/serialbus/modbus/adueditor/mainwindow.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 examples of the QtSerialBus module. diff --git a/examples/serialbus/modbus/adueditor/modbustcpclient.cpp b/examples/serialbus/modbus/adueditor/modbustcpclient.cpp index 28067e9..9700b96 100644 --- a/examples/serialbus/modbus/adueditor/modbustcpclient.cpp +++ b/examples/serialbus/modbus/adueditor/modbustcpclient.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 examples of the QtSerialBus module. diff --git a/examples/serialbus/modbus/adueditor/modbustcpclient.h b/examples/serialbus/modbus/adueditor/modbustcpclient.h index 9f0b516..9fafbf0 100644 --- a/examples/serialbus/modbus/adueditor/modbustcpclient.h +++ b/examples/serialbus/modbus/adueditor/modbustcpclient.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 examples of the QtSerialBus module. diff --git a/examples/serialbus/modbus/adueditor/modbustcpclient_p.h b/examples/serialbus/modbus/adueditor/modbustcpclient_p.h index 5161487..075fb2c 100644 --- a/examples/serialbus/modbus/adueditor/modbustcpclient_p.h +++ b/examples/serialbus/modbus/adueditor/modbustcpclient_p.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 examples of the QtSerialBus module. diff --git a/examples/serialbus/modbus/adueditor/plaintextedit.h b/examples/serialbus/modbus/adueditor/plaintextedit.h index 8eeaf8f..8d8a383 100644 --- a/examples/serialbus/modbus/adueditor/plaintextedit.h +++ b/examples/serialbus/modbus/adueditor/plaintextedit.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 examples of the QtSerialBus module. |