diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-07-30 19:17:01 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-01 14:48:57 +0200 |
| commit | eda28d82e239c57533e73be622b26a3985fb86ce (patch) | |
| tree | 6f18228de6944f2eca7a4d1a1a1f200f68c97f34 /src/bluetooth/android/devicediscoverybroadcastreceiver.cpp | |
| parent | 00cc61aa4e9d624dc4894afe819f7413a9204a68 (diff) | |
Fix Qt6 build
Prepend namespace to text stream operands
and fix deprecated function and enum usage.
Change-Id: Ib9c74f940173f678d7c5af143cd2fd4e8da982e7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/bluetooth/android/devicediscoverybroadcastreceiver.cpp')
| -rw-r--r-- | src/bluetooth/android/devicediscoverybroadcastreceiver.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bluetooth/android/devicediscoverybroadcastreceiver.cpp b/src/bluetooth/android/devicediscoverybroadcastreceiver.cpp index f1f50516..19023efe 100644 --- a/src/bluetooth/android/devicediscoverybroadcastreceiver.cpp +++ b/src/bluetooth/android/devicediscoverybroadcastreceiver.cpp @@ -72,7 +72,7 @@ static QBitArray initializeMinorCaches() case QBluetoothDeviceInfo::MiscellaneousDevice: case QBluetoothDeviceInfo::ComputerDevice: case QBluetoothDeviceInfo::PhoneDevice: - case QBluetoothDeviceInfo::LANAccessDevice: + case QBluetoothDeviceInfo::NetworkDevice: case QBluetoothDeviceInfo::AudioVideoDevice: case QBluetoothDeviceInfo::PeripheralDevice: case QBluetoothDeviceInfo::ImagingDevice: @@ -114,7 +114,7 @@ static const MajorClassJavaToQtMapping majorMappings[] = { { "HEALTH", QBluetoothDeviceInfo::HealthDevice }, { "IMAGING", QBluetoothDeviceInfo::ImagingDevice }, { "MISC", QBluetoothDeviceInfo::MiscellaneousDevice }, - { "NETWORKING", QBluetoothDeviceInfo::LANAccessDevice }, + { "NETWORKING", QBluetoothDeviceInfo::NetworkDevice }, { "PERIPHERAL", QBluetoothDeviceInfo::PeripheralDevice }, { "PHONE", QBluetoothDeviceInfo::PhoneDevice }, { "TOY", QBluetoothDeviceInfo::ToyDevice }, @@ -130,7 +130,7 @@ static const int minorIndexSizes[] = { 61, // QBluetoothDevice::MiscellaneousDevice 18, // QBluetoothDevice::ComputerDevice 35, // QBluetoothDevice::PhoneDevice - 62, // QBluetoothDevice::LANAccessDevice + 62, // QBluetoothDevice::NetworkDevice 0, // QBluetoothDevice::AudioVideoDevice 56, // QBluetoothDevice::PeripheralDevice 63, // QBluetoothDevice::ImagingDEvice @@ -227,7 +227,7 @@ static const MinorClassJavaToQtMapping minorMappings[] = { // QBluetoothDevice::Miscellaneous { nullptr, 0 }, // index 61 & separator - // QBluetoothDevice::LANAccessDevice + // QBluetoothDevice::NetworkDevice { nullptr, 0 }, // index 62 & separator // QBluetoothDevice::ImagingDevice |