diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-16 23:24:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-16 23:24:43 +0200 |
| commit | aabce3a08d1a65f8abc4872bd91a6dfd45cf7fd6 (patch) | |
| tree | 457dc8b600e0a4db7654708d921ef4ae398ae0d0 /src/bluetooth/qlowenergydescriptor.cpp | |
| parent | b956fda0a1fa5813eb147e85ffc98e25d7177481 (diff) | |
| parent | 9dba73f30505ed7c220055788fba3cd201848fdb (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I3eec9a22565585d4fc40831d609a3083ce99a52c
Diffstat (limited to 'src/bluetooth/qlowenergydescriptor.cpp')
| -rw-r--r-- | src/bluetooth/qlowenergydescriptor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bluetooth/qlowenergydescriptor.cpp b/src/bluetooth/qlowenergydescriptor.cpp index 5df8d2d2..37a8f619 100644 --- a/src/bluetooth/qlowenergydescriptor.cpp +++ b/src/bluetooth/qlowenergydescriptor.cpp @@ -226,7 +226,7 @@ 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 + \note On \macos and iOS handles can differ from 0, but these values have no special meaning outside of internal/private API. */ QLowEnergyHandle QLowEnergyDescriptor::handle() const |