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

Change-Id: I0a4a8e2c1ace22466ade52ae27a3112ddc67cb28

2 files changed, 9 insertions, 2 deletions

diff --git a/tests/bttestui/btlocaldevice.cpp b/tests/bttestui/btlocaldevice.cpp
index 54de57ca..3f0ebdaf 100644
--- a/tests/bttestui/btlocaldevice.cpp
+++ b/tests/bttestui/btlocaldevice.cpp
@@ -61,6 +61,8 @@ BtLocalDevice::BtLocalDevice(QObject *parent) :
             this, SLOT(disconnected(QBluetoothAddress)));
     connect(localDevice, SIGNAL(pairingDisplayConfirmation(QBluetoothAddress,QString)),
             this, SLOT(pairingDisplayConfirmation(QBluetoothAddress,QString)));
+    connect(localDevice, &QBluetoothLocalDevice::pairingDisplayPinCode,
+            this, &BtLocalDevice::pairingDisplayPinCode);
 
     if (localDevice->isValid()) {
         deviceAgent = new QBluetoothDeviceDiscoveryAgent(this);
@@ -199,11 +201,15 @@ void BtLocalDevice::disconnected(const QBluetoothAddress &addr)
 
 void BtLocalDevice::pairingDisplayConfirmation(const QBluetoothAddress &address, const QString &pin)
 {
-    Q_UNUSED(pin);
-    Q_UNUSED(address);
+    qDebug() << "PairingDisplayConfirmation" << address << pin;
     QTimer::singleShot(3000, this, SLOT(confirmPairing()));
 }
 
+void BtLocalDevice::pairingDisplayPinCode(const QBluetoothAddress &address, const QString &pin)
+{
+    qDebug() << "PairingDisplayPinCode" << address << pin;
+}
+
 void BtLocalDevice::confirmPairing()
 {
     static bool confirm = false;
diff --git a/tests/bttestui/btlocaldevice.h b/tests/bttestui/btlocaldevice.h
index 703e1dce..a6130b12 100644
--- a/tests/bttestui/btlocaldevice.h
+++ b/tests/bttestui/btlocaldevice.h
@@ -67,6 +67,7 @@ public slots:
     void connected(const QBluetoothAddress &addr);
     void disconnected(const QBluetoothAddress &addr);
     void pairingDisplayConfirmation(const QBluetoothAddress &address, const QString &pin);
+    void pairingDisplayPinCode(const QBluetoothAddress &address, const QString &pin);
     void confirmPairing();
     void cycleSecurityFlags();