diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:18:03 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:18:03 +0100 |
commit | 2caa6e1ca0094b2e2a4cd6005836d46a7ddfdf6a (patch) | |
tree | e2653c5aeda85ef44a174a467319b8142aa958bf /examples/serialbus/can/main.cpp | |
parent | 0f33c698229ebb418b71a19dd409e2b5a417182e (diff) | |
parent | 50e4edb4b23947f9fcdb99ea0101660f0752cc1f (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Ia04f54eee1264b659d8928b7f08d7221f587bc54
Diffstat (limited to 'examples/serialbus/can/main.cpp')
-rw-r--r-- | examples/serialbus/can/main.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/examples/serialbus/can/main.cpp b/examples/serialbus/can/main.cpp index b4b4675..757f3aa 100644 --- a/examples/serialbus/can/main.cpp +++ b/examples/serialbus/can/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 |