Add missing Standard BT service/profile uuids

The BtLE related uuids will be added by the BTLE feature branch.

This change adjusts the docs such that it becomes obvious whether
a UUID is a service, profile or both.

Task-number: QTBUG-36123
Change-Id: I487471c9227a0fe11f443c54d21a29b23a11e076
Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

3 files changed, 93 insertions, 62 deletions

diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp
index 79c43a18..c79cffce 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp
@@ -315,8 +315,9 @@ static QString serviceNameForClassUuid(const uint value)
     case QBluetoothUuid::PANU: return QBluetoothServiceDiscoveryAgent::tr("Personal Area Networking (PANU)");
     case QBluetoothUuid::NAP: return QBluetoothServiceDiscoveryAgent::tr("Personal Area Networking (NAP)");
     case QBluetoothUuid::GN: return QBluetoothServiceDiscoveryAgent::tr("Personal Area Networking (GN)");
-    case QBluetoothUuid::DirectPrinting: return QBluetoothServiceDiscoveryAgent::tr("Basic Printing (DP)");
-    //case QBluetoothUuid::ReferencePrinting: return QBluetoothServiceDiscoveryAgent::tr("");
+    case QBluetoothUuid::DirectPrinting: return QBluetoothServiceDiscoveryAgent::tr("Basic Direct Printing (BPP)");
+    case QBluetoothUuid::ReferencePrinting: return QBluetoothServiceDiscoveryAgent::tr("Basic Reference Printing (BPP)");
+    case QBluetoothUuid::BasicImage: return QBluetoothServiceDiscoveryAgent::tr("Basic Imaging Profile");
     case QBluetoothUuid::ImagingResponder: return QBluetoothServiceDiscoveryAgent::tr("Basic Imaging Responder");
     case QBluetoothUuid::ImagingAutomaticArchive: return QBluetoothServiceDiscoveryAgent::tr("Basic Imaging Archive");
     case QBluetoothUuid::ImagingReferenceObjects: return QBluetoothServiceDiscoveryAgent::tr("Basic Imaging Ref Objects");
@@ -338,6 +339,13 @@ static QString serviceNameForClassUuid(const uint value)
     case QBluetoothUuid::MessageAccessServer: return QBluetoothServiceDiscoveryAgent::tr("Message Access Server");
     case QBluetoothUuid::MessageNotificationServer: return QBluetoothServiceDiscoveryAgent::tr("Message Notification Server");
     case QBluetoothUuid::MessageAccessProfile: return QBluetoothServiceDiscoveryAgent::tr("Message Access");
+    case QBluetoothUuid::GNSS: return QBluetoothServiceDiscoveryAgent::tr("Global Navigation Satellite System");
+    case QBluetoothUuid::GNSSServer: return QBluetoothServiceDiscoveryAgent::tr("Global Navigation Satellite System Server");
+    case QBluetoothUuid::Display3D: return QBluetoothServiceDiscoveryAgent::tr("3D Synchronization Display");
+    case QBluetoothUuid::Glasses3D: return QBluetoothServiceDiscoveryAgent::tr("3D Synchronization Glasses");
+    case QBluetoothUuid::Synchronization3D: return QBluetoothServiceDiscoveryAgent::tr("3D Synchronization");
+    case QBluetoothUuid::MPSProfile: return QBluetoothServiceDiscoveryAgent::tr("Multi-Profile Specification (Profile)");
+    case QBluetoothUuid::MPSService: return QBluetoothServiceDiscoveryAgent::tr("Multi-Profile Specification");
     case QBluetoothUuid::PnPInformation: return QBluetoothServiceDiscoveryAgent::tr("Device Identification");
     //case QBluetoothUuid::GenericNetworking: return QBluetoothServiceDiscoveryAgent::tr("");
     //case QBluetoothUuid::GenericFileTransfer: return QBluetoothServiceDiscoveryAgent::tr("");
diff --git a/src/bluetooth/qbluetoothuuid.cpp b/src/bluetooth/qbluetoothuuid.cpp
index 63f5e0e8..27215656 100644
--- a/src/bluetooth/qbluetoothuuid.cpp
+++ b/src/bluetooth/qbluetoothuuid.cpp
@@ -98,66 +98,81 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34
 /*!
     \enum QBluetoothUuid::ServiceClassUuid
 
-    This enum is a convienience type for Bluetooth service class UUIDs. Values of this type will be
-    implicitly converted into a QBluetoothUuid when necessary.
-
-    \value PublicBrowseGroup    Public browse group service class. Services which have the public
-    browse group in their \l {QBluetoothServiceInfo::BrowseGroupList}{browse group list} are discoverable
-    by the remote devices.
-    \value ObexObjectPush       OBEX object push service UUID.
-    \value ServiceDiscoveryServer
-    \value BrowseGroupDescriptor Browser group descriptor
-    \value SerialPort            Serial Port Profile UUID
-    \value LANAccessUsingPPP     LAN Access Profile UUID
-    \value DialupNetworking      Dial-up Networking Profile UUID
-    \value IrMCSync              Synchronization Profile UUID
-    \value OBEXFileTransfer      File Transfer Profile (FTP) UUID
-    \value IrMCSyncCommand       Synchronization Profile UUID
-    \value Headset               Headset Profile (HSP) UUID
-    \value AudioSource           Advanced Audio Distribution Profile (A2DP) UUID
-    \value AudioSink             Advanced Audio Distribution Profile (A2DP) UUID
-    \value AV_RemoteControlTarget Audio/Video Remote Control Profile (AVRCP) UUID
-    \value AdvancedAudioDistribution Advanced Audio Distribution Profile (A2DP) UUID
-    \value AV_RemoteControl       Audio/Video Remote Control Profile (AVRCP) UUID
-    \value AV_RemoteControlController Audio/Video Remote Control Profile UUID
-    \value HeadsetAG              Headset Profile (HSP) UUID
-    \value PANU                   Personal Area Networking Profile (PAN) UUID
-    \value NAP                    Personal Area Networking Profile (PAN) UUID
-    \value GN                     Personal Area Networking Profile (PAN) UUID
-    \value DirectPrinting         Basic Printing Profile (BPP) UUID
-    \value ReferencePrinting      Related to Basic Printing Profile (BPP) UUID
-    \value ImagingResponder       Basic Imaging Profile (BIP) UUID
-    \value ImagingAutomaticArchive Basic Imaging Profile (BIP) UUID
-    \value ImagingReferenceObjects Basic Imaging Profile (BIP) UUID
-    \value Handsfree              Hands-Free Profile (HFP) Service Class Identifier and Profile Identifier
-    \value HandsfreeAudioGateway  Hands-free Profile (HFP) UUID
-    \value DirectPrintingReferenceObjectsService Basic Printing Profile (BPP) UUID
-    \value ReflectedUI            Basic Printing Profile (BPP) UUID
-    \value BasicPrinting          Basic Printing Profile (BPP) UUID
-    \value PrintingStatus         Basic Printing Profile (BPP) UUID
-    \value HumanInterfaceDeviceService Human Interface Device (HID) UUID
-    \value HardcopyCableReplacement Hardcopy Cable Replacement Profile (HCRP)
-    \value HCRPrint               Hardcopy Cable Replacement Profile (HCRP)
-    \value HCRScan                Hardcopy Cable Replacement Profile (HCRP)
-    \value SIMAccess              SIM Access Profile (SAP) UUID
-    \value PhonebookAccessPCE     Phonebook Access Profile (PBAP) UUID
-    \value PhonebookAccessPSE     Phonebook Access Profile (PBAP) UUID
-    \value PhonebookAccess        Phonebook Access Profile (PBAP)
-    \value HeadsetHS              Headset Profile (HSP) UUID
-    \value MessageAccessServer    Message Access Profile (MAP) UUID
-    \value MessageNotificationServer Message Access Profile (MAP) UUID
-    \value MessageAccessProfile   Message Access Profile (MAP) UUID
-    \value PnPInformation         Device Identification (DID) UUID
-    \value GenericNetworking      Generic networking
-    \value GenericFileTransfer    Generic file transfer
-    \value GenericAudio           Generic audio
-    \value GenericTelephony       Generic telephone
-    \value VideoSource            Video Distribution Profile (VDP)
-    \value VideoSink              Video Distribution Profile (VDP)
-    \value VideoDistribution      Video Distribution Profile (VDP)
-    \value HDP                    Health Device Profile
-    \value HDPSource              Health Device Profile
-    \value HDPSink                Health Device Profile
+    This enum is a convienience type for Bluetooth service class and profile UUIDs. Values of this type will be
+    implicitly converted into a QBluetoothUuid when necessary. Some UUIDs refer to service class ids, others to profile
+    ids and some can be used as both. In general, profile UUIDs shall only be used in a
+    \l QBluetoothServiceInfo::BluetoothProfileDescriptorList attribute and service class UUIDs shall only be used
+    in a \l QBluetoothServiceInfo::ServiceClassIds attribute. If the UUID is marked as profile and service class UUID
+    it can be used as a value for either of the above service attributes. Such a dual use has historical reasons
+    but is no longer permissible for newer UUIDs.
+
+    The list below explicitly states as what type each UUID shall be used.
+
+    \value ServiceDiscoveryServer Service discovery server UUID (service)
+    \value BrowseGroupDescriptor Browser group descriptor (service)
+    \value PublicBrowseGroup     Public browse group service class. Services which have the public
+                                 browse group in their \l {QBluetoothServiceInfo::BrowseGroupList}{browse group list}
+                                 are discoverable by the remote devices.
+    \value SerialPort            Serial Port Profile UUID (service & profile)
+    \value LANAccessUsingPPP     LAN Access Profile UUID (service & profile)
+    \value DialupNetworking      Dial-up Networking Profile UUID (service & profile)
+    \value IrMCSync              Synchronization Profile UUID (service & profile)
+    \value ObexObjectPush        OBEX object push service UUID (service & profile)
+    \value OBEXFileTransfer      File Transfer Profile (FTP) UUID (service & profile)
+    \value IrMCSyncCommand       Synchronization Profile UUID (profile)
+    \value Headset               Headset Profile (HSP) UUID (service & profile)
+    \value AudioSource           Advanced Audio Distribution Profile (A2DP) UUID (service)
+    \value AudioSink             Advanced Audio Distribution Profile (A2DP) UUID (service)
+    \value AV_RemoteControlTarget Audio/Video Remote Control Profile (AVRCP) UUID (service)
+    \value AdvancedAudioDistribution Advanced Audio Distribution Profile (A2DP) UUID (profile)
+    \value AV_RemoteControl       Audio/Video Remote Control Profile (AVRCP) UUID (service & profile)
+    \value AV_RemoteControlController Audio/Video Remote Control Profile UUID (service)
+    \value HeadsetAG              Headset Profile (HSP) UUID (service)
+    \value PANU                   Personal Area Networking Profile (PAN) UUID (service & profile)
+    \value NAP                    Personal Area Networking Profile (PAN) UUID (service & profile)
+    \value GN                     Personal Area Networking Profile (PAN) UUID (service & profile)
+    \value DirectPrinting         Basic Printing Profile (BPP) UUID (service)
+    \value ReferencePrinting      Related to Basic Printing Profile (BPP) UUID (service)
+    \value BasicImage             Basic Imaging Profile (BIP) UUID (profile)
+    \value ImagingResponder       Basic Imaging Profile (BIP) UUID (service)
+    \value ImagingAutomaticArchive Basic Imaging Profile (BIP) UUID (service)
+    \value ImagingReferenceObjects Basic Imaging Profile (BIP) UUID (service)
+    \value Handsfree              Hands-Free Profile (HFP) UUID (service & profile)
+    \value HandsfreeAudioGateway  Hands-Free Audio Gateway (HFP) UUID (service)
+    \value DirectPrintingReferenceObjectsService Basic Printing Profile (BPP) UUID (service)
+    \value ReflectedUI            Basic Printing Profile (BPP) UUID (service)
+    \value BasicPrinting          Basic Printing Profile (BPP) UUID (profile)
+    \value PrintingStatus         Basic Printing Profile (BPP) UUID (service)
+    \value HumanInterfaceDeviceService Human Interface Device (HID) UUID (service & profile)
+    \value HardcopyCableReplacement Hardcopy Cable Replacement Profile (HCRP) (profile)
+    \value HCRPrint               Hardcopy Cable Replacement Profile (HCRP) (service)
+    \value HCRScan                Hardcopy Cable Replacement Profile (HCRP) (service)
+    \value SIMAccess              SIM Access Profile (SAP) UUID (service and profile)
+    \value PhonebookAccessPCE     Phonebook Access Profile (PBAP) UUID (service)
+    \value PhonebookAccessPSE     Phonebook Access Profile (PBAP) UUID (service)
+    \value PhonebookAccess        Phonebook Access Profile (PBAP) (profile)
+    \value HeadsetHS              Headset Profile (HSP) UUID (service)
+    \value MessageAccessServer    Message Access Profile (MAP) UUID (service)
+    \value MessageNotificationServer Message Access Profile (MAP) UUID (service)
+    \value MessageAccessProfile   Message Access Profile (MAP) UUID (profile)
+    \value GNSS                   Global Navigation Satellite System UUID (profile)
+    \value GNSSServer             Global Navigation Satellite System Server (UUID) (service)
+    \value Display3D              3D Synchronization Display UUID (service)
+    \value Glasses3D              3D Synchronization Glasses UUID (service)
+    \value Synchronization3D      3D Synchronization UUID (profile)
+    \value MPSProfile             Multi-Profile Specification UUID (profile)
+    \value MPSService             Multi-Profile Specification UUID (service)
+    \value PnPInformation         Device Identification (DID) UUID (service & profile)
+    \value GenericNetworking      Generic networking UUID (service)
+    \value GenericFileTransfer    Generic file transfer UUID (service)
+    \value GenericAudio           Generic audio UUID (service)
+    \value GenericTelephony       Generic telephone UUID (service)
+    \value VideoSource            Video Distribution Profile (VDP) UUID (service)
+    \value VideoSink              Video Distribution Profile (VDP) UUID (service)
+    \value VideoDistribution      Video Distribution Profile (VDP) UUID (profile)
+    \value HDP                    Health Device Profile (HDP) UUID (profile)
+    \value HDPSource              Health Device Profile Source (HDP) UUID (service)
+    \value HDPSink                Health Device Profile Sink (HDP) UUID (service)
 
     \sa QBluetoothServiceInfo::ServiceClassIds
 */
diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h
index 7e9eeeae..014b975a 100644
--- a/src/bluetooth/qbluetoothuuid.h
+++ b/src/bluetooth/qbluetoothuuid.h
@@ -112,6 +112,7 @@ public:
         GN = 0x1117,
         DirectPrinting = 0x1118,
         ReferencePrinting = 0x1119,
+        BasicImage = 0x111a,
         ImagingResponder = 0x111b,
         ImagingAutomaticArchive = 0x111c,
         ImagingReferenceObjects = 0x111d,
@@ -133,6 +134,13 @@ public:
         MessageAccessServer = 0x1132,
         MessageNotificationServer = 0x1133,
         MessageAccessProfile = 0x1134,
+        GNSS = 0x1135,
+        GNSSServer = 0x1136,
+        Display3D = 0x1137,
+        Glasses3D = 0x1138,
+        Synchronization3D = 0x1139,
+        MPSProfile = 0x113a,
+        MPSService = 0x113b,
         PnPInformation = 0x1200,
         GenericNetworking = 0x1201,
         GenericFileTransfer = 0x1202,