summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-10-09 13:32:31 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2019-10-09 18:15:26 +0200
commitf2e6b7be2ed9e84389ecb957b6191efdf8571b40 (patch)
treed837db89908b7efec54d51e72543783f8953582a
parent5f3cec5be9ea8f8ee7ac547d799c330c87453f88 (diff)
Fix build without deprecations and Qt major version set to 6
The version disables some deprecated tool Apis and for the regular Windows build the same change as commit ccc1544f5ff929f466df8c790a4e7595e177a720 is needed. Change-Id: I7473df0b8f0e51cc30dc640c09c77f61310185be Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--src/bluetooth/qbluetoothdevicediscoveryagent_win.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_win.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_win.cpp
index 159428d4..a2bfdeb6 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_win.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_win.cpp
@@ -541,11 +541,11 @@ void QBluetoothDeviceDiscoveryAgentPrivate::processDiscoveredDevice(
} else {
qCDebug(QT_BT_WINDOWS) << "Updating device:" << deviceIt->name() << deviceIt->address();
// merge service uuids
- QList<QBluetoothUuid> uuids = deviceIt->serviceUuids();
+ QVector<QBluetoothUuid> uuids = deviceIt->serviceUuids();
uuids.append(foundDevice.serviceUuids());
- const QSet<QBluetoothUuid> uuidSet = uuids.toSet();
+ const QSet<QBluetoothUuid> uuidSet(uuids.begin(), uuids.end());
if (deviceIt->serviceUuids().count() != uuidSet.count())
- deviceIt->setServiceUuids(uuidSet.toList().toVector());
+ deviceIt->setServiceUuids(uuidSet.values().toVector());
if (deviceIt->coreConfigurations() != foundDevice.coreConfigurations())
deviceIt->setCoreConfigurations(
QBluetoothDeviceInfo::BaseRateAndLowEnergyCoreConfiguration);