diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-03-14 11:16:27 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-03-14 11:16:27 +0100 |
| commit | 83cd348bde8e856d2508c2514cd33a90e593461d (patch) | |
| tree | 9dbd933129ef4a9e514218fc6177d775aa94c9db /src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp | |
| parent | 4439541b05ae88a30159a5597d40f569328783ca (diff) | |
| parent | 40ac14e13b0aa07124c6ae9ef8eacfe6d8550684 (diff) | |
Merge branch 'dev' into btle
Conflicts:
src/bluetooth/qbluetoothuuid.cpp
tests/bttestui/btlocaldevice.cpp
Change-Id: Id16ab93ec61361950669da7eb232769c5dc4644f
Diffstat (limited to 'src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp index 8b80ed11..c7fc47fb 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp @@ -522,7 +522,6 @@ QVariant QBluetoothServiceDiscoveryAgentPrivate::readAttributeValue(QXmlStreamRe qCWarning(QT_BT_BLUEZ) << "unknown attribute type" << xml.name().toString() << xml.attributes().value(QLatin1String("value")).toString(); - Q_ASSERT(false); xml.skipCurrentElement(); return QVariant(); } |