diff options
author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-07-12 07:57:09 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-07-12 08:07:34 +0200 |
commit | 60e6d4946b50bfa1d0916bdd3780b3c756a2bd6f (patch) | |
tree | bb4d88b83b392de143d25cef3c9fe8dd90f35cbe /src/bluetooth/qbluetooth.cpp | |
parent | 0c028edf23de0073ba14115b43488a928c6fa492 (diff) | |
parent | d20e2e84ec2edd770c830fe2c399b4c76321d187 (diff) |
Merge remote-tracking branch 'gerrit/5.7' into dev
Change-Id: Id86ae2d8b9f8ebd2a37e8e5fc279916bc92d9982
Diffstat (limited to 'src/bluetooth/qbluetooth.cpp')
-rw-r--r-- | src/bluetooth/qbluetooth.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/bluetooth/qbluetooth.cpp b/src/bluetooth/qbluetooth.cpp index 5e8b812a..483fe65a 100644 --- a/src/bluetooth/qbluetooth.cpp +++ b/src/bluetooth/qbluetooth.cpp @@ -76,6 +76,7 @@ namespace QBluetooth { /*! \enum QBluetooth::AttAccessConstraint + \since 5.7 This enum describes the possible requirements for reading or writing an ATT attribute. |