diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-02-17 10:38:48 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-02-17 10:38:48 +0100 |
| commit | 8fe7fbe6b552b0d196967cfea85fede5e7c211b9 (patch) | |
| tree | b90f246cc3b8847cedaf6b5f8dc045cfc563b9be /src/bluetooth/qbluetoothserviceinfo.h | |
| parent | 9bcb79f0c741f7805dad17c467a5c2041227a18a (diff) | |
| parent | b4bde05d8459cc57c25bac3f7be19fcf03908606 (diff) | |
Merge branch 'dev' into btle
Conflicts:
examples/bluetooth/bluetooth.pro
src/bluetooth/doc/src/examples.qdoc
src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp
src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
src/bluetooth/qbluetoothservicediscoveryagent_p.h
src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
Change-Id: Ie1577e4b0f469cd5a6b05a61cbe94f180a64448d
Diffstat (limited to 'src/bluetooth/qbluetoothserviceinfo.h')
| -rw-r--r-- | src/bluetooth/qbluetoothserviceinfo.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/bluetooth/qbluetoothserviceinfo.h b/src/bluetooth/qbluetoothserviceinfo.h index 0e6555c0..4d3b8612 100644 --- a/src/bluetooth/qbluetoothserviceinfo.h +++ b/src/bluetooth/qbluetoothserviceinfo.h @@ -141,7 +141,7 @@ public: inline void setServiceUuid(const QBluetoothUuid &uuid); inline QBluetoothUuid serviceUuid() const; - inline QList<QBluetoothUuid> serviceClassUuids() const; + QList<QBluetoothUuid> serviceClassUuids() const; QBluetoothServiceInfo &operator=(const QBluetoothServiceInfo &other); @@ -228,12 +228,6 @@ inline QBluetoothUuid QBluetoothServiceInfo::serviceUuid() const { return attribute(ServiceId).value<QBluetoothUuid>(); } - -inline QList<QBluetoothUuid> QBluetoothServiceInfo::serviceClassUuids() const -{ - return attribute(ServiceClassIds).value<QList<QBluetoothUuid> >(); -} - QT_END_NAMESPACE #endif |