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

Change-Id: I3ca73a1a829da2c2ee87e5d980165ef867d2f1b9

1 files changed, 4 insertions, 4 deletions

diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
index 319e631f..1f11174f 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
@@ -195,10 +195,10 @@ void QBluetoothServiceDiscoveryAgentPrivate::start(const QBluetoothAddress &addr
         _q_serviceDiscoveryFinished();
 #else
     qBBBluetoothDebug() << "Starting Service discovery for" << address.toString();
-    const char *filePath = QByteArray("/pps/services/bluetooth/remote_devices/").append(address.toString().toUtf8().constData()).constData();
-    if ((m_rdfd = qt_safe_open(filePath, O_RDONLY)) == -1) {
-        if (QFile::exists(QLatin1String(filePath) + QLatin1String("-00")) ||
-            QFile::exists(QLatin1String(filePath) + QLatin1String("-01"))) {
+    QByteArray filePath = QByteArray("/pps/services/bluetooth/remote_devices/").append(address.toString().toUtf8().constData());
+    if ((m_rdfd = qt_safe_open(filePath.constData(), O_RDONLY)) == -1) {
+        if (QFile::exists(filePath + QLatin1String("-00")) ||
+            QFile::exists(filePath + QLatin1String("-01"))) {
             qBBBluetoothDebug() << "LE device discovered...skipping";
         } else {
             qWarning() << "Failed to open " << filePath;