diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:14:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:14:42 +0200 |
| commit | 60d1ebac9e81619a24e66fc6defc3e0299491a9d (patch) | |
| tree | 39cc5bfb0f6f5b22b0d0a2e71d92ac7e9e69d0e7 /src/bluetooth/qbluetoothdeviceinfo.h | |
| parent | 22bffc8c5927d2a6e6b50b05bb6c9db2bc0c7e15 (diff) | |
| parent | 71a0d199a29001cc31bfde15aabcc53cf88aae1e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I64352b6cc066255972874e2f9c28abff35f0d613
Diffstat (limited to 'src/bluetooth/qbluetoothdeviceinfo.h')
| -rw-r--r-- | src/bluetooth/qbluetoothdeviceinfo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothdeviceinfo.h b/src/bluetooth/qbluetoothdeviceinfo.h index 2cf26a21..751c8384 100644 --- a/src/bluetooth/qbluetoothdeviceinfo.h +++ b/src/bluetooth/qbluetoothdeviceinfo.h @@ -58,7 +58,7 @@ public: MiscellaneousDevice = 0, ComputerDevice = 1, PhoneDevice = 2, - LANAccessDevice = 3, + LANAccessDevice = 3, // TODO Qt 6 rename to NetworkDevice -> inconsistency with MinorNetworkClass AudioVideoDevice = 4, PeripheralDevice = 5, ImagingDevice = 6, |