Add missing Bt Core spec service attribute identifiers

Task-number: QTBUG-31728
Change-Id: I2d4410a3ac87bdf9e85805403bf3c6165d4967dd
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>

4 files changed, 32 insertions, 15 deletions

diff --git a/src/bluetooth/qbluetoothserviceinfo.cpp b/src/bluetooth/qbluetoothserviceinfo.cpp
index 64b5cead..5cc53ea4 100644
--- a/src/bluetooth/qbluetoothserviceinfo.cpp
+++ b/src/bluetooth/qbluetoothserviceinfo.cpp
@@ -98,19 +98,26 @@ QT_BEGIN_NAMESPACE_BLUETOOTH
 /*!
     \enum QBluetoothServiceInfo::AttributeId
 
-    Bluetooth service attributes.
+    Bluetooth service attributes. Please check the Bluetooth Core Specification for a more detailed description of these attributes.
 
+    \value ServiceRecordHandle      Specifies a service record from which attributes can be retrieved.
     \value ServiceClassIds          UUIDs of service classes that the service conforms to.
+    \value ServiceRecordState       Attibute changes when any other service attribute is added, deleted or modified.
     \value ServiceId                UUID that uniquely identifies the service.
     \value ProtocolDescriptorList   List of protocols used by the service.
     \value BrowseGroupList          List of browse groups the service is in.
+    \value LanguageBaseAttributeIdList      List of language base attribute IDs to support human-readable attributes.
+    \value ServiceInfoTimeToLive    Number of seconds for which the service record is expected to remain valid and unchanged.
     \value ServiceAvailability      Value indicating the availability of the service.
+    \value BluetoothProfileDescriptorList   List of profiles to which the service conforms.
+    \value DocumentationUrl         URL that points to the documentation on the service..
+    \value ClientExecutableUrl      URL that refers to the location of an application that can be used to utilize the service.
+    \value IconUrl                  URL to the location of the icon representing the service.
+    \value AdditionalProtocolDescriptorList     Additional protocols used by the service. This attribute extends the \l QBluetoothServiceInfo::ProtocolDescriptorList.
     \value PrimaryLanguageBase      Base index for primary language text descriptors.
-    \value ServiceRecordHandle      Specifies a service record from which attributes can be retrieved
     \value ServiceName              Name of the Bluetooth service in the primary language.
     \value ServiceDescription       Description of the Bluetooth service in the primary language.
-    \value ServiceProvider          Name of the company / entity that provides the Bluetooth service primary
-    language.
+    \value ServiceProvider          Name of the company / entity that provides the Bluetooth service primary language.
 */
 
 /*!
diff --git a/src/bluetooth/qbluetoothserviceinfo.h b/src/bluetooth/qbluetoothserviceinfo.h
index 3b138f6a..1a7448f5 100644
--- a/src/bluetooth/qbluetoothserviceinfo.h
+++ b/src/bluetooth/qbluetoothserviceinfo.h
@@ -63,10 +63,18 @@ public:
     enum AttributeId {
         ServiceRecordHandle = 0x0000,
         ServiceClassIds = 0x0001,
+        ServiceRecordState = 0x0002,
         ServiceId = 0x0003,
         ProtocolDescriptorList = 0x0004,
         BrowseGroupList = 0x0005,
+        LanguageBaseAttributeIdList = 0x0006,
+        ServiceInfoTimeToLive = 0x0007,
         ServiceAvailability = 0x0008,
+        BluetoothProfileDescriptorList = 0x0009,
+        DocumentationUrl = 0x000A,
+        ClientExecutableUrl = 0x000B,
+        IconUrl = 0x000C,
+        AdditionalProtocolDescriptorList = 0x000D,
         PrimaryLanguageBase = 0x0100,
         ServiceName = PrimaryLanguageBase + 0x0000,
         ServiceDescription = PrimaryLanguageBase + 0x0001,
diff --git a/src/bluetooth/qbluetoothuuid.cpp b/src/bluetooth/qbluetoothuuid.cpp
index 70f4ad7b..fb38f0a3 100644
--- a/src/bluetooth/qbluetoothuuid.cpp
+++ b/src/bluetooth/qbluetoothuuid.cpp
@@ -71,16 +71,17 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34
     This enum is a convienience type for Bluetooth protocol UUIDs. Values of this type will be
     implicitly converted into a QBluetoothUuid when necessary.
 
-    \value Sdp      SDP protocol UUID.
-    \value Udp      UDP protocol UUID.
-    \value Rfcomm   RFCOMM protocol UUID.
-    \value Tcp      TCP protocol UUID.
-    \value TcsBin   Telephony Control Specification UUID.
-    \value TcsAt    Telephony Control Specification AT UUID.
-    \value Obex     OBEX protocol UUID.
-    \value Ip       IP protocol UUID.
-    \value Ftp      FTP protocol UUID.
-    \value Http     HTTP protocol UUID.
+    \value Sdp      SDP protocol UUID
+    \value Udp      UDP protocol UUID
+    \value Rfcomm   RFCOMM protocol UUID
+    \value Tcp      TCP protocol UUID
+    \value TcsBin   Telephony Control Specification UUID
+    \value TcsAt    Telephony Control Specification AT UUID
+    \value Att      Attribute protocol UUID
+    \value Obex     OBEX protocol UUID
+    \value Ip       IP protocol UUID
+    \value Ftp      FTP protocol UUID
+    \value Http     HTTP protocol UUID
     \value Wsp      WSP UUID
     \value Bnep     Bluetooth Network Encapsulation Protocol UUID
     \value Upnp     Extended Service Discovery Profile UUID
@@ -94,7 +95,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34
     \value UdiCPlain UDI protocol UUID
     \value McapControlChannel Multi-Channel Adaptation Protocol UUID
     \value McapDataChannel Multi-Channel Adaptation Protocol UUID
-    \value L2cap    L2CAP protocol UUID.
+    \value L2cap    L2CAP protocol UUID
 */
 
 /*!
diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h
index f7c73cbc..23361d16 100644
--- a/src/bluetooth/qbluetoothuuid.h
+++ b/src/bluetooth/qbluetoothuuid.h
@@ -67,6 +67,7 @@ public:
         Tcp = 0x0004,
         TcsBin = 0x0005,
         TcsAt = 0x0006,
+        Att = 0x0007,
         Obex = 0x0008,
         Ip = 0x0009,
         Ftp = 0x000A,