diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2018-09-24 11:17:18 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2018-10-09 07:48:02 +0000 |
| commit | 21d51a63a88f926c20976ccad0e1b852d2efed1e (patch) | |
| tree | 7f5f4238936692129b664a7da135e533fa0e0b07 | |
| parent | fac56a229b45395488f3e41bf178361c72b3ee1e (diff) | |
Replace QBluetoothDeviceInfo::LANAccessDevice with NetworkDevice
Change-Id: I4b52ded8fbf310ecfd64c82308046f8d10108597
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | src/bluetooth/qbluetoothdeviceinfo.cpp | 5 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothdeviceinfo.h | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/bluetooth/qbluetoothdeviceinfo.cpp b/src/bluetooth/qbluetoothdeviceinfo.cpp index 5e26dea5..cc0d98a4 100644 --- a/src/bluetooth/qbluetoothdeviceinfo.cpp +++ b/src/bluetooth/qbluetoothdeviceinfo.cpp @@ -61,7 +61,10 @@ QT_BEGIN_NAMESPACE \value MiscellaneousDevice A miscellaneous device. \value ComputerDevice A computer device or PDA. \value PhoneDevice A telephone device. - \value LANAccessDevice A device that provides access to a local area network. + \value LANAccessDevice A device that provides access to a local area network + (deprecated since Qt 5.13 and replaced by + \l QBluetoothDeviceInfo::NetworkDevice). + \value NetworkDevice A device that provides access to a local area network (since Qt 5.13). \value AudioVideoDevice A device capable of playback or capture of audio and/or video. \value PeripheralDevice A peripheral device such as a keyboard, mouse, and so on. \value ImagingDevice An imaging device such as a display, printer, scanner or camera. diff --git a/src/bluetooth/qbluetoothdeviceinfo.h b/src/bluetooth/qbluetoothdeviceinfo.h index 72072f58..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, |