diff options
author | Alex Blasche <alexander.blasche@qt.io> | 2018-02-20 09:39:56 +0100 |
---|---|---|
committer | Alex Blasche <alexander.blasche@qt.io> | 2018-02-20 09:39:56 +0100 |
commit | a34a645e89aea7f19d2ed14af00099768a07a6be (patch) | |
tree | 700efe52fc2ba6345b26316188fb0cfbc8e49a15 /examples/bluetooth/lowenergyscanner/serviceinfo.cpp | |
parent | a18338b552d45b6877e89221a5d6205081a54308 (diff) | |
parent | b87affb8b2353af57ed5e736d82d67eb56ea1235 (diff) |
Merge remote-tracking branch 'gerrit/dev' into win
Change-Id: I4e86dcfe5088b0bd5087de309c435250c76d4718
Diffstat (limited to 'examples/bluetooth/lowenergyscanner/serviceinfo.cpp')
-rw-r--r-- | examples/bluetooth/lowenergyscanner/serviceinfo.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/examples/bluetooth/lowenergyscanner/serviceinfo.cpp b/examples/bluetooth/lowenergyscanner/serviceinfo.cpp index c424b046..844c9cec 100644 --- a/examples/bluetooth/lowenergyscanner/serviceinfo.cpp +++ b/examples/bluetooth/lowenergyscanner/serviceinfo.cpp @@ -1,13 +1,23 @@ /*************************************************************************** ** ** Copyright (C) 2013 BlackBerry Limited. All rights reserved. -** 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 QtBluetooth module of the Qt Toolkit. ** ** $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 |