diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-07-01 09:49:47 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-07-01 09:49:47 +0200 |
| commit | cb6bdcb3fb94a38613304b60724e0cd02962cd14 (patch) | |
| tree | 36f33693d8d0cea72da5f0fbc1ca569bb657a26e /src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp | |
| parent | 49b37dcc3780c736b3ece8782e2c3c74385c09e9 (diff) | |
| parent | e31df00987b6d9c8558ceb812bb68be71106d773 (diff) | |
Merge "Merge branch '5.3' into dev" into refs/staging/dev
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())); |