Fix compilation on BB10

Change-Id: I1f701aa8d0df85da2cbd31e3ce4b2f3578725ca4
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

2 files changed, 11 insertions, 13 deletions

diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp
index 4132fe76..771ce56f 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp
@@ -216,12 +216,12 @@ void QBluetoothDeviceDiscoveryAgentPrivate::remoteDevicesChanged(int fd)
          * BT_DEVICE_TYPE_UNKNOWN is 255
          */
         if (dev_type == 0 || dev_type == 1)
-            deviceInfo.setCoreConfiguration(QBluetoothDeviceInfo::LowEnergyCoreConfiguration);
+            deviceInfo.setCoreConfigurations(QBluetoothDeviceInfo::LowEnergyCoreConfiguration);
         else{
             if (hasGatt)
-                deviceInfo.setCoreConfiguration(QBluetoothDeviceInfo::BaseRateAndLowEnergyCoreConfiguration);
+                deviceInfo.setCoreConfigurations(QBluetoothDeviceInfo::BaseRateAndLowEnergyCoreConfiguration);
             else
-                deviceInfo.setCoreConfiguration(QBluetoothDeviceInfo::BaseRateCoreConfiguration);
+                deviceInfo.setCoreConfigurations(QBluetoothDeviceInfo::BaseRateCoreConfiguration);
         }
         discoveredDevices.append(deviceInfo);
         if (!updated) // We are not allowed to emit a signal with the updated version
diff --git a/src/bluetooth/qlowenergycontroller_qnx.cpp b/src/bluetooth/qlowenergycontroller_qnx.cpp
index d4f10ec6..df2e8b3b 100644
--- a/src/bluetooth/qlowenergycontroller_qnx.cpp
+++ b/src/bluetooth/qlowenergycontroller_qnx.cpp
@@ -107,7 +107,7 @@ void QLowEnergyControllerPrivate::serviceConnected(const char *bdaddr, const cha
     qCDebug(QT_BT_QNX) << "[SERVICE: Connected] Device service: " << service;
     qCDebug(QT_BT_QNX) << "[SERVICE: Connected] Possible error: " << err;
 
-    QString lowEnergyUuid(service);
+    QString lowEnergyUuid = QLatin1String(service);
     QBluetoothUuid leUuid;
 
     //In case of custom UUIDs (e.g. Texas Instruments SenstorTag LE Device)
@@ -247,10 +247,10 @@ void QLowEnergyControllerPrivate::serviceNotification(int instance, short unsign
     for (int i = 0; i < p->m_leServices.size(); i++) {
         for (int j = 0; j < p->m_leServices.at(i).characteristics().size(); j++) {
 
-            QString charHandle;
-            charHandle.setNum(handle);
-            charHandle = charHandle;
-            if (charHandle == p->m_leServices.at(i).d_ptr->characteristicList.at(j).handle() ) {
+//            QString charHandle;
+//            charHandle.setNum(handle);
+//            charHandle = charHandle;
+            if (handle == p->m_leServices.at(i).d_ptr->characteristicList.at(j).handle() ) {
                 chars = QLowEnergyCharacteristicInfo(p->m_leServices.at(i).d_ptr->characteristicList.at(j));
                 QByteArray receivedValue;
 
@@ -291,7 +291,7 @@ void QLowEnergyControllerPrivate::serviceDisconnected(const char *bdaddr, const
 {
     QSharedPointer<QLowEnergyControllerPrivate> *classPointer = static_cast<QSharedPointer<QLowEnergyControllerPrivate> *>(userData);
     QLowEnergyControllerPrivate *p = classPointer->data();
-    QString lowEnergyUuid(service);
+    QString lowEnergyUuid = QLatin1String(service);
     qCDebug(QT_BT_QNX) << "LE Service: " << lowEnergyUuid << service;
     QBluetoothUuid leUuid;
 
@@ -585,11 +585,9 @@ void QLowEnergyControllerPrivate::readDescriptors(QLowEnergyCharacteristicInfo &
     }
 
     for (int i = 0; i < count; i++) {
-        QString descHanlde;
-        descHanlde.setNum(descriptorList[i].handle);
-        QString descriptorUuid(descriptorList[i].uuid);
+        QString descriptorUuid = QLatin1String(descriptorList[i].uuid);
         QBluetoothUuid descUuid(descriptorUuid);
-        QLowEnergyDescriptorInfo descriptor(descUuid, descHanlde);
+        QLowEnergyDescriptorInfo descriptor(descUuid, QBluetoothUuid::CharacteristicExtendedProperties, descriptorList[i].handle); //TODO set proper descriptor type
 
         uint8_t more = 1;
         int byteCount;