diff options
Diffstat (limited to 'src/bluetooth/qlowenergydescriptor.cpp')
-rw-r--r-- | src/bluetooth/qlowenergydescriptor.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/bluetooth/qlowenergydescriptor.cpp b/src/bluetooth/qlowenergydescriptor.cpp index 9c25baa4..16b5b02b 100644 --- a/src/bluetooth/qlowenergydescriptor.cpp +++ b/src/bluetooth/qlowenergydescriptor.cpp @@ -1,8 +1,8 @@ /*************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2015 The Qt Company Ltd. ** Copyright (C) 2013 BlackBerry Limited. All rights reserved. -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtBluetooth module of the Qt Toolkit. ** @@ -11,9 +11,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -24,8 +24,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -222,6 +222,9 @@ QBluetoothUuid QLowEnergyDescriptor::uuid() const /*! Returns the handle of the descriptor or \c 0 if the handle cannot be accessed on the platform or the descriptor is invalid. + + \note On OS X and iOS handles can differ from 0, but these + values have no special meaning outside of internal/private API. */ QLowEnergyHandle QLowEnergyDescriptor::handle() const { @@ -234,8 +237,8 @@ QLowEnergyHandle QLowEnergyDescriptor::handle() const /*! Returns the cached value of the descriptor. - A descriptor value may be updated using - \l QLowEnergyService::writeDescriptor(). + The cached descriptor value may be updated using + \l QLowEnergyService::writeDescriptor() or \l QLowEnergyService::readDescriptor(). */ QByteArray QLowEnergyDescriptor::value() const { |