diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-04-01 08:33:21 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-04-01 08:36:34 +0200 |
| commit | 4ed0678f93d7fc6a9d0d43dfdfe6608e827eb176 (patch) | |
| tree | 3faa743c8a7a84e9f97408acd625c4ed797e6f81 /src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp | |
| parent | ec82c463d3f83454130dccfa71988af13768c5eb (diff) | |
| parent | b4bf23453e65995bdd8827b6e146edd5cafeddc3 (diff) | |
Merge branch '5.4' into 5.5
Change-Id: I177affc6c60fd3cc55e914a7ea2a9aeba260906f
Diffstat (limited to 'src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp index 86d35428..f66603a9 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp @@ -272,7 +272,9 @@ void QBluetoothServiceDiscoveryAgentPrivate::_q_finishSdpScan(QBluetoothServiceD if (errorCode != QBluetoothServiceDiscoveryAgent::NoError) { qCWarning(QT_BT_BLUEZ) << "SDP search failed for" - << discoveredDevices.at(0).address().toString(); + << (!discoveredDevices.isEmpty() + ? discoveredDevices.at(0).address().toString() + : QStringLiteral("<Unknown>")); // We have an error which we need to indicate and stop further processing discoveredDevices.clear(); error = errorCode; |