diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:43:34 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:43:34 +0100 |
commit | 3c29e286c7e79a3704a849e05e47d17d6a7cf62c (patch) | |
tree | c1b9a0d03714f22497acce77c1e7efe0714ff190 /examples/bluetooth/chat/Button.qml | |
parent | 013ad0570844975cd5c72a77d1cfefa30c3ea656 (diff) | |
parent | 6029bad7d1007aecd155985ba13d6c23a01015b8 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Iaa053dcb125490ee1e83d7e27cb75d4171297b9f
Diffstat (limited to 'examples/bluetooth/chat/Button.qml')
-rw-r--r-- | examples/bluetooth/chat/Button.qml | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/examples/bluetooth/chat/Button.qml b/examples/bluetooth/chat/Button.qml index d1136730..8c0096c9 100644 --- a/examples/bluetooth/chat/Button.qml +++ b/examples/bluetooth/chat/Button.qml @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the QtBluetooth 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 |