diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-05-26 14:56:49 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-05-26 14:56:49 +0200 |
| commit | f334ea4b196950c4074e7513626aabeef3d99d7f (patch) | |
| tree | ccb07d59afbb60a92b80a061645c8013aab9b96c /src/bluetooth/qbluetoothuuid.h | |
| parent | 3910d9ffcc11db7b3beb7f2b6f0c1754103cfacb (diff) | |
| parent | 552f1a164d627720942414915fb56ae7d3b7ef22 (diff) | |
Merge branch 'dev' into btle
Conflicts:
examples/bluetooth/bluetooth.pro
src/bluetooth/bluez/bluez.pri
src/bluetooth/doc/src/bluetooth-index.qdoc
src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
src/bluetooth/qbluetoothdeviceinfo.cpp
src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
src/bluetooth/qbluetoothservicediscoveryagent_p.h
src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
Change-Id: I88b22c51a4ee95b067ef8d2b2fddb5cbff4566f8
Diffstat (limited to 'src/bluetooth/qbluetoothuuid.h')
| -rw-r--r-- | src/bluetooth/qbluetoothuuid.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h index c67d2e31..ee3477ac 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. @@ -291,13 +291,19 @@ public: quint16 toUInt16(bool *ok = 0) const; quint32 toUInt32(bool *ok = 0) const; quint128 toUInt128() const; + + static QString serviceClassToString(ServiceClassUuid uuid); + static QString protocolToString(ProtocolUuid uuid); }; +#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 |