diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-06-27 11:47:22 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-06-27 11:47:22 +0200 |
| commit | e31df00987b6d9c8558ceb812bb68be71106d773 (patch) | |
| tree | a8a259477410620f8f5f30fa8c2e4c900496d15a /src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp | |
| parent | 7beb4375483f74cc5be501dbcd91c82a80178936 (diff) | |
| parent | 094be0786f75ed33564c6096778510dab4500eb8 (diff) | |
Merge branch '5.3' into dev
Conflicts:
.qmake.conf
src/bluetooth/qbluetoothlocaldevice_bluez.cpp
src/bluetooth/qbluetoothlocaldevice_p.h
src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
Change-Id: Ifb0c01eb8bffbffcd2416ea8d7bf1d36eb1c70f2
Diffstat (limited to 'src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp index 177ce63e..4752a0ab 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp @@ -651,7 +651,7 @@ QVariant QBluetoothServiceDiscoveryAgentPrivate::readAttributeValue(QXmlStreamRe } xml.skipCurrentElement(); return QVariant::fromValue(uuid); - } else if (xml.name() == QLatin1String("text")) { + } else if (xml.name() == QLatin1String("text") || xml.name() == QLatin1String("url")) { QString value = xml.attributes().value(QStringLiteral("value")).toString(); if (xml.attributes().value(QStringLiteral("encoding")) == QLatin1String("hex")) value = QString::fromUtf8(QByteArray::fromHex(value.toLatin1())); |