diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-03-14 11:16:27 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-03-14 11:16:27 +0100 |
| commit | 83cd348bde8e856d2508c2514cd33a90e593461d (patch) | |
| tree | 9dbd933129ef4a9e514218fc6177d775aa94c9db /src/bluetooth/qbluetoothuuid.h | |
| parent | 4439541b05ae88a30159a5597d40f569328783ca (diff) | |
| parent | 40ac14e13b0aa07124c6ae9ef8eacfe6d8550684 (diff) | |
Merge branch 'dev' into btle
Conflicts:
src/bluetooth/qbluetoothuuid.cpp
tests/bttestui/btlocaldevice.cpp
Change-Id: Id16ab93ec61361950669da7eb232769c5dc4644f
Diffstat (limited to 'src/bluetooth/qbluetoothuuid.h')
| -rw-r--r-- | src/bluetooth/qbluetoothuuid.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h index 03b06bf2..c67d2e31 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,7 +134,14 @@ public: MessageAccessServer = 0x1132, MessageNotificationServer = 0x1133, MessageAccessProfile = 0x1134, - PnPInformation = 0x1135, + GNSS = 0x1135, + GNSSServer = 0x1136, + Display3D = 0x1137, + Glasses3D = 0x1138, + Synchronization3D = 0x1139, + MPSProfile = 0x113a, + MPSService = 0x113b, + PnPInformation = 0x1200, GenericNetworking = 0x1201, GenericFileTransfer = 0x1202, GenericAudio = 0x1203, |