diff options
Diffstat (limited to 'src/bluetooth/qbluetoothdeviceinfo.h')
| -rw-r--r-- | src/bluetooth/qbluetoothdeviceinfo.h | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/src/bluetooth/qbluetoothdeviceinfo.h b/src/bluetooth/qbluetoothdeviceinfo.h index d59eb27d..db0de7cd 100644 --- a/src/bluetooth/qbluetoothdeviceinfo.h +++ b/src/bluetooth/qbluetoothdeviceinfo.h @@ -60,7 +60,10 @@ public: MiscellaneousDevice = 0, ComputerDevice = 1, PhoneDevice = 2, - LANAccessDevice = 3, // TODO Qt 6 rename to NetworkDevice -> inconsistency with MinorNetworkClass +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + LANAccessDevice = 3, +#endif + NetworkDevice = 3, AudioVideoDevice = 4, PeripheralDevice = 5, ImagingDevice = 6, @@ -191,12 +194,14 @@ public: }; Q_DECLARE_FLAGS(ServiceClasses, ServiceClass) - //TODO Qt6 Remove DataCompleteness -> it serves no purpose +#if QT_DEPRECATED_SINCE(5, 13) + // adding QT_DEPRECATED causes compile failure with gcc 7 enum DataCompleteness { DataComplete, DataIncomplete, DataUnavailable }; +#endif enum class Field { None = 0x0000, @@ -241,9 +246,19 @@ public: qint16 rssi() const; void setRssi(qint16 signal); - void setServiceUuids(const QList<QBluetoothUuid> &uuids, DataCompleteness completeness); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED void setServiceUuids(const QList<QBluetoothUuid> &uuids, DataCompleteness completeness); + QT_DEPRECATED DataCompleteness serviceUuidsCompleteness() const; +#endif + +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +#ifndef Q_QDOC //suppress qdoc warnings + QVector<QBluetoothUuid> serviceUuids() const; +#endif // Q_QDOC +#else QList<QBluetoothUuid> serviceUuids(DataCompleteness *completeness = nullptr) const; - DataCompleteness serviceUuidsCompleteness() const; +#endif + void setServiceUuids(const QVector<QBluetoothUuid> &uuids); QVector<quint16> manufacturerIds() const; QByteArray manufacturerData(quint16 manufacturerId) const; |