summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2014-03-05 10:25:18 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-06 09:16:37 +0100
commit90736356a0b6551229ba8642ce0bd59cff86db01 (patch)
tree8248f195342db46b96f2c9416289f5478363704f
parentccc88d846a2b44b3f7d95ddcc7e91c95c4f037c0 (diff)
Fix uuid value of ServiceClassId PnpInformation
Fo far it was using the GNSS profile uuid. Change-Id: Ifbe51353a6355d260c42d870656a78059e440181 Reviewed-by: Nedim Hadzic <nedimhadzija@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
-rw-r--r--src/bluetooth/qbluetoothservicediscoveryagent_android.cpp2
-rw-r--r--src/bluetooth/qbluetoothuuid.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp
index 731f5b3e..79c43a18 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_android.cpp
@@ -338,7 +338,7 @@ 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::PnPInformation: return QBluetoothServiceDiscoveryAgent::tr("Navigation Satellite System");
+ case QBluetoothUuid::PnPInformation: return QBluetoothServiceDiscoveryAgent::tr("Device Identification");
//case QBluetoothUuid::GenericNetworking: return QBluetoothServiceDiscoveryAgent::tr("");
//case QBluetoothUuid::GenericFileTransfer: return QBluetoothServiceDiscoveryAgent::tr("");
//case QBluetoothUuid::GenericAudio: return QBluetoothServiceDiscoveryAgent::tr("");
diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h
index ef69e983..7e9eeeae 100644
--- a/src/bluetooth/qbluetoothuuid.h
+++ b/src/bluetooth/qbluetoothuuid.h
@@ -133,7 +133,7 @@ public:
MessageAccessServer = 0x1132,
MessageNotificationServer = 0x1133,
MessageAccessProfile = 0x1134,
- PnPInformation = 0x1135,
+ PnPInformation = 0x1200,
GenericNetworking = 0x1201,
GenericFileTransfer = 0x1202,
GenericAudio = 0x1203,