QNX complie error solved.

Random address variable moved from Bluez to both platforms. Added friend class in QLowEnergyCharacteristicInfo.

This was done because on QNX platform it was unable to compile.

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

2 files changed, 2 insertions, 1 deletions

diff --git a/src/bluetooth/qlowenergycharacteristicinfo.h b/src/bluetooth/qlowenergycharacteristicinfo.h
index 77866b71..565d2195 100644
--- a/src/bluetooth/qlowenergycharacteristicinfo.h
+++ b/src/bluetooth/qlowenergycharacteristicinfo.h
@@ -57,6 +57,7 @@ class Q_BLUETOOTH_EXPORT QLowEnergyCharacteristicInfo
     friend class QLowEnergyServiceInfoPrivate;
     friend class QLowEnergyController;
     friend class QLowEnergyControllerPrivate;
+    friend class QLowEnergyCharacteristicInfoPrivate;
 public:
 
     enum Error {
diff --git a/src/bluetooth/qlowenergyserviceinfo_p.h b/src/bluetooth/qlowenergyserviceinfo_p.h
index e91a78bb..bdda1598 100644
--- a/src/bluetooth/qlowenergyserviceinfo_p.h
+++ b/src/bluetooth/qlowenergyserviceinfo_p.h
@@ -82,12 +82,12 @@ public:
     bool connected;
     QBluetoothDeviceInfo deviceInfo;
     QString errorString;
+    bool randomAddress;
 #ifdef QT_BLUEZ_BLUETOOTH
     QString startingHandle;
     QString endingHandle;
     QString path;
     QBluetoothAddress adapterAddress;
-    bool randomAddress;
     void connectToTerminal();
     void setHandles();
     void setCharacteristics();