Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: I57338ea228fb533a4a16cf09ebfe4e65d012b00f

4 files changed, 17 insertions, 14 deletions

diff --git a/src/bluetooth/bluez/bluez5_helper.cpp b/src/bluetooth/bluez/bluez5_helper.cpp
index 90b7e5e0..f798088e 100644
--- a/src/bluetooth/bluez/bluez5_helper.cpp
+++ b/src/bluetooth/bluez/bluez5_helper.cpp
@@ -197,8 +197,9 @@ QVersionNumber bluetoothdVersion()
     if (bluezDaemonVersion()->isNull()) {
         qCDebug(QT_BT_BLUEZ) << "Detecting bluetoothd version";
         //Order of matching
-        // 1. Pick whatever the user decides via BLUETOOTH_USE_BLUEZ_DBUS_LE
-        const QString version = qEnvironmentVariable("BLUETOOTH_USE_BLUEZ_DBUS_LE");
+        // 1. Pick whatever the user decides via BLUETOOTH_FORCE_DBUS_LE_VERSION
+        // Set version to below version 5.42 to use custom/old GATT stack implementation
+        const QString version = qEnvironmentVariable("BLUETOOTH_FORCE_DBUS_LE_VERSION");
         if (!version.isNull()) {
             const QVersionNumber vn = QVersionNumber::fromString(version);
             if (!vn.isNull()) {
diff --git a/src/bluetooth/qlowenergycontroller.cpp b/src/bluetooth/qlowenergycontroller.cpp
index 3be1aed3..caa6c3fa 100644
--- a/src/bluetooth/qlowenergycontroller.cpp
+++ b/src/bluetooth/qlowenergycontroller.cpp
@@ -292,11 +292,13 @@ void registerQLowEnergyControllerMetaType()
     }
 }
 
-static QLowEnergyControllerPrivate *privateController()
+static QLowEnergyControllerPrivate *privateController(QLowEnergyController::Role role)
 {
 #if QT_CONFIG(bluez) && !defined(QT_BLUEZ_NO_BTLE)
-    // for now Bluez DBus disabled
-    if (false && bluetoothdVersion() >= QVersionNumber(5, 42)) {
+    // The new DBUS implementation only supports Central role for now
+    // For Peripheral role support see QTBUG-66909
+    if (role == QLowEnergyController::CentralRole
+            && bluetoothdVersion() >= QVersionNumber(5, 42)) {
         qCWarning(QT_BT) << "Using BlueZ LE DBus API";
         return new QLowEnergyControllerPrivateBluezDBus();
     } else {
@@ -329,7 +331,7 @@ QLowEnergyController::QLowEnergyController(
                             QObject *parent)
     : QObject(parent)
 {
-    d_ptr = privateController();
+    d_ptr = privateController(CentralRole);
 
     Q_D(QLowEnergyController);
     d->q_ptr = this;
@@ -358,7 +360,7 @@ QLowEnergyController::QLowEnergyController(
                             QObject *parent)
     : QObject(parent)
 {
-        d_ptr = privateController();
+        d_ptr = privateController(CentralRole);
 
     Q_D(QLowEnergyController);
     d->q_ptr = this;
@@ -391,7 +393,7 @@ QLowEnergyController::QLowEnergyController(
                             QObject *parent)
     : QObject(parent)
 {
-    d_ptr = privateController();
+    d_ptr = privateController(CentralRole);
 
     Q_D(QLowEnergyController);
     d->q_ptr = this;
@@ -436,7 +438,7 @@ QLowEnergyController *QLowEnergyController::createPeripheral(QObject *parent)
 QLowEnergyController::QLowEnergyController(QObject *parent)
     : QObject(parent)
 {
-    d_ptr = privateController();
+    d_ptr = privateController(PeripheralRole);
 
     Q_D(QLowEnergyController);
     d->q_ptr = this;
diff --git a/src/imports/nfc/qdeclarativendeffilter.cpp b/src/imports/nfc/qdeclarativendeffilter.cpp
index 010be47f..6cbda747 100644
--- a/src/imports/nfc/qdeclarativendeffilter.cpp
+++ b/src/imports/nfc/qdeclarativendeffilter.cpp
@@ -78,7 +78,7 @@
 /*!
     \qmlproperty QQmlNdefRecord::TypeNameFormat NdefFilter::typeNameFormat
 
-    This property holds the NDEF record name format type \enum QQmlNdefRecord::TypeNameFormat.
+    This property holds the NDEF record name format type \l QQmlNdefRecord::TypeNameFormat.
 */
 
 /*!
diff --git a/src/nfc/qnearfieldtarget_android.cpp b/src/nfc/qnearfieldtarget_android.cpp
index 690fc272..26f3d429 100644
--- a/src/nfc/qnearfieldtarget_android.cpp
+++ b/src/nfc/qnearfieldtarget_android.cpp
@@ -192,12 +192,12 @@ QNearFieldTarget::RequestId NearFieldTarget::readNdefMessages()
     // Sending QNdefMessage, requestCompleted and exit.
     QNdefMessage qNdefMessage = QNdefMessage::fromByteArray(ndefMessageQBA);
     QMetaObject::invokeMethod(this, "ndefMessageRead", Qt::QueuedConnection,
-                              Q_ARG(QNdefMessage&, qNdefMessage));
+                              Q_ARG(QNdefMessage, qNdefMessage));
     QMetaObject::invokeMethod(this, "requestCompleted", Qt::QueuedConnection,
-                              Q_ARG(QNearFieldTarget::RequestId&, requestId));
+                              Q_ARG(QNearFieldTarget::RequestId, requestId));
     QMetaObject::invokeMethod(this, "ndefMessageRead", Qt::QueuedConnection,
-                              Q_ARG(QNdefMessage&, qNdefMessage),
-                              Q_ARG(QNearFieldTarget::RequestId&, requestId));
+                              Q_ARG(QNdefMessage, qNdefMessage),
+                              Q_ARG(QNearFieldTarget::RequestId, requestId));
     return requestId;
 }