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

Conflicts:
	src/bluetooth/qbluetoothlocaldevice_qnx.cpp
	src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp

Change-Id: If7dd968047fec5352567e9b67ca5b8e680c7523d

1 files changed, 9 insertions, 9 deletions

diff --git a/src/bluetooth/qbluetoothlocaldevice_qnx.cpp b/src/bluetooth/qbluetoothlocaldevice_qnx.cpp
index 860df8c3..c3159a60 100644
--- a/src/bluetooth/qbluetoothlocaldevice_qnx.cpp
+++ b/src/bluetooth/qbluetoothlocaldevice_qnx.cpp
@@ -237,7 +237,7 @@ void QBluetoothLocalDevicePrivate::setHostMode(QBluetoothLocalDevice::HostMode m
     }
     //If the device is in PowerOff state and the profile is changed then the power has to be turned on
     if (currentHostMode == QBluetoothLocalDevice::HostPoweredOff) {
-        qBBBluetoothDebug() << "Powering on";
+        qCDebug(QT_BT_QNX) << "Powering on";
         powerOn();
     }
 
@@ -320,9 +320,9 @@ void QBluetoothLocalDevicePrivate::connectedDevices()
 
 void QBluetoothLocalDevicePrivate::controlReply(ppsResult result)
 {
-    qBBBluetoothDebug() << Q_FUNC_INFO << result.msg << result.dat;
+    qCDebug(QT_BT_QNX) << Q_FUNC_INFO << result.msg << result.dat;
     if (!result.errorMsg.isEmpty()) {
-        qWarning() << Q_FUNC_INFO << result.errorMsg;
+        qCWarning(QT_BT_QNX) << Q_FUNC_INFO << result.errorMsg;
         if (result.msg == QStringLiteral("initiate_pairing"))
             q_ptr->error(QBluetoothLocalDevice::PairingError);
         else
@@ -332,17 +332,17 @@ void QBluetoothLocalDevicePrivate::controlReply(ppsResult result)
 
 void QBluetoothLocalDevicePrivate::controlEvent(ppsResult result)
 {
-    qBBBluetoothDebug() << Q_FUNC_INFO << "Control Event" << result.msg;
+    qCDebug(QT_BT_QNX) << Q_FUNC_INFO << "Control Event" << result.msg;
     if (result.msg == QStringLiteral("access_changed")) {
         if (__newHostMode == -1 && result.dat.size() > 1 &&
                 result.dat.first() == QStringLiteral("level")) {
             QBluetoothLocalDevice::HostMode newHostMode = hostMode();
-            qBBBluetoothDebug() << "New Host mode" << newHostMode;
+            qCDebug(QT_BT_QNX) << "New Host mode" << newHostMode;
             connectedDevices();
             Q_EMIT q_ptr->hostModeStateChanged(newHostMode);
         }
     } else if (result.msg == QStringLiteral("pairing_complete")) {
-        qBBBluetoothDebug() << "pairing completed";
+        qCDebug(QT_BT_QNX) << "pairing completed";
         if (result.dat.contains(QStringLiteral("addr"))) {
             const QBluetoothAddress address = QBluetoothAddress(
                         result.dat.at(result.dat.indexOf(QStringLiteral("addr")) + 1));
@@ -353,18 +353,18 @@ void QBluetoothLocalDevicePrivate::controlEvent(ppsResult result)
                     result.dat.at(result.dat.indexOf(QStringLiteral("trusted")) + 1) == QStringLiteral("true")) {
                 pairingStatus = QBluetoothLocalDevice::AuthorizedPaired;
             }
-            qBBBluetoothDebug() << "pairing completed" << address.toString();
+            qCDebug(QT_BT_QNX) << "pairing completed" << address.toString();
             Q_EMIT q_ptr->pairingFinished(address, pairingStatus);
         }
     } else if (result.msg == QStringLiteral("device_deleted")) {
-        qBBBluetoothDebug() << "device deleted";
+        qCDebug(QT_BT_QNX) << "device deleted";
         if (result.dat.contains(QStringLiteral("addr"))) {
             const QBluetoothAddress address = QBluetoothAddress(
                         result.dat.at(result.dat.indexOf(QStringLiteral("addr")) + 1));
             Q_EMIT q_ptr->pairingFinished(address, QBluetoothLocalDevice::Unpaired);
         }
     } else if (result.msg == QStringLiteral("radio_shutdown")) {
-        qBBBluetoothDebug() << "radio shutdown";
+        qCDebug(QT_BT_QNX) << "radio shutdown";
         Q_EMIT q_ptr->hostModeStateChanged(QBluetoothLocalDevice::HostPoweredOff);
     }
 }