diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:45:42 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 09:27:47 +0100 |
commit | 3e71f12de6995b2d9aa77b78f86251e49de8b2c5 (patch) | |
tree | b3a481ba80560cb671dd570db8931200838033be /examples/serialbus/modbus/slave/main.cpp | |
parent | a24e76d16ab3c3b18180e3dce554bc7696ea91c0 (diff) | |
parent | 60c0114e846a593895503a78d13b006f93e95675 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts:
.qmake.conf
Change-Id: Icfbad81955ad8a7c4ddc49ac4ee952bcba6317ec
Diffstat (limited to 'examples/serialbus/modbus/slave/main.cpp')
-rw-r--r-- | examples/serialbus/modbus/slave/main.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/examples/serialbus/modbus/slave/main.cpp b/examples/serialbus/modbus/slave/main.cpp index 38242a8..4f97a39 100644 --- a/examples/serialbus/modbus/slave/main.cpp +++ b/examples/serialbus/modbus/slave/main.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** ** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the QtSerialBus module. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: ** ** "Redistribution and use in source and binary forms, with or without ** modification, are permitted provided that the following conditions are |