diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2018-10-16 08:34:04 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2018-10-16 09:46:17 +0200 |
| commit | cfa14f0f2ed4bee62ebcfa1191877086f44deeef (patch) | |
| tree | e5622c6422f3de193a3eefc6929e3b4b038585d2 /tests | |
| parent | 5ac4a2ce452d4ab9b8529a35c266c4323e455f12 (diff) | |
| parent | dfee9aa22f2dbaae3476770d0ab65f26494fe451 (diff) | |
Merge remote-tracking branch 'gerrit/5.12' into dev
Conflicts:
src/bluetooth/osx/osxbtsdpinquiry.mm
Change-Id: I637adc5a5271e136af7d0ac6380086728ffb15c5
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp | 6 | ||||
| -rw-r--r-- | tests/bttestui/btlocaldevice.cpp | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp index 25764703..9bac6791 100644 --- a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp +++ b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp @@ -289,11 +289,13 @@ void tst_QBluetoothServiceDiscoveryAgent::tst_serviceDiscoveryAdapters() serviceInfo.setAttribute(QBluetoothServiceInfo::BrowseGroupList, QBluetoothUuid(QBluetoothUuid::PublicBrowseGroup)); + QBluetoothServiceInfo::Sequence profileSequence; QBluetoothServiceInfo::Sequence classId; classId << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::SerialPort)); - serviceInfo.setAttribute(QBluetoothServiceInfo::ServiceClassIds, classId); + classId << QVariant::fromValue(quint16(0x100)); + profileSequence.append(QVariant::fromValue(classId)); serviceInfo.setAttribute(QBluetoothServiceInfo::BluetoothProfileDescriptorList, - classId); + profileSequence); serviceInfo.setServiceUuid(uuid); diff --git a/tests/bttestui/btlocaldevice.cpp b/tests/bttestui/btlocaldevice.cpp index 3f0ebdaf..d7590b70 100644 --- a/tests/bttestui/btlocaldevice.cpp +++ b/tests/bttestui/btlocaldevice.cpp @@ -576,12 +576,17 @@ void BtLocalDevice::serverListenPort() if (!ret) return; + QBluetoothServiceInfo::Sequence profileSequence; QBluetoothServiceInfo::Sequence classId; classId << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::SerialPort)); + classId << QVariant::fromValue(quint16(0x100)); + profileSequence.append(QVariant::fromValue(classId)); serviceInfo.setAttribute(QBluetoothServiceInfo::BluetoothProfileDescriptorList, - classId); + profileSequence); - classId.prepend(QVariant::fromValue(QBluetoothUuid(QString(TEST_SERVICE_UUID)))); + classId.clear(); + classId << QVariant::fromValue(QBluetoothUuid(QString(TEST_SERVICE_UUID))); + classId << QVariant::fromValue(QBluetoothUuid(QBluetoothUuid::SerialPort)); serviceInfo.setAttribute(QBluetoothServiceInfo::ServiceClassIds, classId); // Service name, description and provider |