Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta4v5.15.0-beta3v5.15.0-beta2

Change-Id: I037246140f5c52dde3335952d4bf77e43b1c3503

1 files changed, 7 insertions, 2 deletions

diff --git a/src/bluetooth/qlowenergycontroller_bluezdbus.cpp b/src/bluetooth/qlowenergycontroller_bluezdbus.cpp
index 5dde8774..d69fb6cd 100644
--- a/src/bluetooth/qlowenergycontroller_bluezdbus.cpp
+++ b/src/bluetooth/qlowenergycontroller_bluezdbus.cpp
@@ -851,7 +851,7 @@ void QLowEnergyControllerPrivateBluezDBus::onCharWriteFinished(QDBusPendingCallW
             updateValueOfCharacteristic(nextJob.handle, nextJob.value, false);
 
         QLowEnergyCharacteristic ch(service, nextJob.handle);
-        // write without respone implies zero feedback
+        // write without response implies zero feedback
         if (nextJob.writeMode == QLowEnergyService::WriteWithResponse) {
             qCDebug(QT_BT_BLUEZ) << "Written Char:" << charData.uuid << nextJob.value.toHex();
             emit service->characteristicWritten(ch, nextJob.value);
@@ -971,7 +971,12 @@ void QLowEnergyControllerPrivateBluezDBus::scheduleNextJob()
             if (charData.uuid != QBluetoothUuid(gattChar.characteristic->uUID()))
                 continue;
 
-            QDBusPendingReply<> reply = gattChar.characteristic->WriteValue(nextJob.value, QVariantMap());
+            QVariantMap options;
+            // The "type" option only works with BlueZ >= 5.50, older versions always write with response
+            options[QStringLiteral("type")] = nextJob.writeMode == QLowEnergyService::WriteWithoutResponse ?
+                QStringLiteral("command") : QStringLiteral("request");
+            QDBusPendingReply<> reply = gattChar.characteristic->WriteValue(nextJob.value, options);
+
             QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher(reply, this);
             connect(watcher, &QDBusPendingCallWatcher::finished,
                     this, &QLowEnergyControllerPrivateBluezDBus::onCharWriteFinished);