From 293af3174c5615978d842603f9a8a4a9b568236c Mon Sep 17 00:00:00 2001 From: Oleg Shparber Date: Mon, 28 Apr 2014 02:09:06 -0700 Subject: Check for QT_NO_DEBUG_STREAM for QBluetoothUuid QDebug helper [ChangeLog][QtBluetooth] QDebug helper for QBluetoothUuid became aware of QT_NO_DEBUG_STREAM define. Change-Id: I20941c32560bfc6beaa8f4f465799af987d0b0cd Reviewed-by: Alex Blasche --- src/bluetooth/qbluetoothuuid.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/bluetooth/qbluetoothuuid.h') diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h index 014b975a..f33d8c13 100644 --- a/src/bluetooth/qbluetoothuuid.h +++ b/src/bluetooth/qbluetoothuuid.h @@ -174,11 +174,14 @@ public: quint128 toUInt128() const; }; +#ifndef QT_NO_DEBUG_STREAM +/// TODO: Move implementation to .cpp, uninline and add Q_BLUETOOTH_EXPORT for Qt 6 inline QDebug operator<<(QDebug debug, const QBluetoothUuid &uuid) { debug << uuid.toString(); return debug; } +#endif QT_END_NAMESPACE -- cgit v1.2.3 From 26e9cf5bc608c7b50fc27a73442966b3880f0825 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Wed, 7 May 2014 16:56:17 +0200 Subject: Service discovery via Bluez5 At the same time we shift the ServiceClassUUID to service name mapping to QBluetoothUuid. It was used by Android and now Bluez 5 uses it too. Task-number: QTBUG-32085 Change-Id: I9f2d4dc4e2997683485f2ba7aaefb646cb72fb75 Reviewed-by: Aaron McCarthy --- src/bluetooth/qbluetoothuuid.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/bluetooth/qbluetoothuuid.h') diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h index f33d8c13..46cff826 100644 --- a/src/bluetooth/qbluetoothuuid.h +++ b/src/bluetooth/qbluetoothuuid.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtBluetooth module of the Qt Toolkit. @@ -172,6 +172,8 @@ public: quint16 toUInt16(bool *ok = 0) const; quint32 toUInt32(bool *ok = 0) const; quint128 toUInt128() const; + + static QString serviceClassToString(ServiceClassUuid uuid); }; #ifndef QT_NO_DEBUG_STREAM -- cgit v1.2.3 From 34028376b21cef3647b47a120fb51192552d71ca Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Thu, 22 May 2014 14:20:07 +0200 Subject: Add QBluetoothUuid::protocolToString() [ChangeLog][QtBluetooth][General] Added QBluetoothUuid::protocolToString(QBluetoothUuid::ProtocolUuid) which returns a human-readable string for the given protocol uuid. Change-Id: I26b9a1b47b1254ac8a49091c2854d1cfab0c66d6 Reviewed-by: Aaron McCarthy --- src/bluetooth/qbluetoothuuid.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/bluetooth/qbluetoothuuid.h') diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h index 46cff826..957a4ed2 100644 --- a/src/bluetooth/qbluetoothuuid.h +++ b/src/bluetooth/qbluetoothuuid.h @@ -174,6 +174,7 @@ public: quint128 toUInt128() const; static QString serviceClassToString(ServiceClassUuid uuid); + static QString protocolToString(ProtocolUuid uuid); }; #ifndef QT_NO_DEBUG_STREAM -- cgit v1.2.3