diff options
| author | Juha Vuolle <juha.vuolle@insta.fi> | 2022-02-07 16:58:02 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-10 14:27:52 +0000 |
| commit | 26bb2825f6447703b1829bf266205cdf4b045762 (patch) | |
| tree | 250e5fea4b199dd5cceec53eabf8344f17b976db /src | |
| parent | d6524c24b85ac02ef072da715f118aeb4ba68f32 (diff) | |
Keep the bluetooth service name if the remote has provided it
For example the "Bt Chat Server" example application service
would always show up as a "Custom Service".
Change-Id: If73423d90d5681ee0c3655ef7ee3ad6cd7638755
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit e27c6600eca2c9b704c73a0b6d28780eb236cefb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp index 1207ac92..4493b7a4 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp @@ -320,7 +320,10 @@ void QBluetoothServiceDiscoveryAgentPrivate::_q_finishSdpScan(QBluetoothServiceD for (const QBluetoothUuid &id : serviceClassUuids) { if (id.minimumSize() == 16) { serviceInfo.setServiceUuid(id); - serviceInfo.setServiceName(QBluetoothServiceDiscoveryAgent::tr("Custom Service")); + if (serviceInfo.serviceName().isEmpty()) { + serviceInfo.setServiceName( + QBluetoothServiceDiscoveryAgent::tr("Custom Service")); + } QBluetoothServiceInfo::Sequence modSeq = serviceInfo.attribute(QBluetoothServiceInfo::ServiceClassIds).value<QBluetoothServiceInfo::Sequence>(); modSeq.removeOne(QVariant::fromValue(id)); |