diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-08-06 13:50:45 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-08-07 10:48:21 +0200 |
| commit | 8596715ffc5036d380217fc55418c82449504fe3 (patch) | |
| tree | a5dedf60a38a4df784041c4a73170527350f5422 /src/bluetooth/qbluetoothdeviceinfo_p.h | |
| parent | 6c3fde845d391e86003ff87371e2d4174b8212dc (diff) | |
Fix build with deprecated APIs disabled since 5.13
The DataCompleteness enum has been deprecated since 5.13, but some of
its uses are still compiled for all versions. Make the related code
and docs compile only when the enum is defined.
To keep source compatibility, add another version of serviceUuids()
returning a QList and not taking a DataCompleteness parameter.
Task-number: QTBUG-76491
Change-Id: I20e045230df18e7211ef9982d98ed6e77ec87d16
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/bluetooth/qbluetoothdeviceinfo_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothdeviceinfo_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bluetooth/qbluetoothdeviceinfo_p.h b/src/bluetooth/qbluetoothdeviceinfo_p.h index 3c19b10f..80fd1472 100644 --- a/src/bluetooth/qbluetoothdeviceinfo_p.h +++ b/src/bluetooth/qbluetoothdeviceinfo_p.h @@ -77,7 +77,9 @@ public: QBluetoothDeviceInfo::MajorDeviceClass majorDeviceClass; quint8 minorDeviceClass; +#if QT_DEPRECATED_SINCE(5, 13) QBluetoothDeviceInfo::DataCompleteness serviceUuidsCompleteness; +#endif QVector<QBluetoothUuid> serviceUuids; QHash<quint16, QByteArray> manufacturerData; QBluetoothDeviceInfo::CoreConfigurations deviceCoreConfiguration; |