Merge remote-tracking branch 'gerrit/dev' into win32

Change-Id: Ie99a67b63f8259227f42f5b464c6bbc16e79313b

1 files changed, 8 insertions, 8 deletions

diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/bluetooth/qbluetoothservicediscoveryagent_p.h
index 37943c15..4a522826 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_p.h
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.h
@@ -195,23 +195,23 @@ private:
     DiscoveryState state;
     QList<QBluetoothUuid> uuidFilter;
 
-    QBluetoothDeviceDiscoveryAgent *deviceDiscoveryAgent;
+    QBluetoothDeviceDiscoveryAgent *deviceDiscoveryAgent = nullptr;
 
     QBluetoothServiceDiscoveryAgent::DiscoveryMode mode;
 
     bool singleDevice;
 #if QT_CONFIG(bluez)
     QString foundHostAdapterPath;
-    OrgBluezManagerInterface *manager;
-    OrgFreedesktopDBusObjectManagerInterface *managerBluez5;
-    OrgBluezAdapterInterface *adapter;
-    OrgBluezDeviceInterface *device;
-    QProcess *sdpScannerProcess;
+    OrgBluezManagerInterface *manager = nullptr;
+    OrgFreedesktopDBusObjectManagerInterface *managerBluez5 = nullptr;
+    OrgBluezAdapterInterface *adapter = nullptr;
+    OrgBluezDeviceInterface *device = nullptr;
+    QProcess *sdpScannerProcess = nullptr;
 #endif
 
 #ifdef QT_ANDROID_BLUETOOTH
-    ServiceDiscoveryBroadcastReceiver *receiver;
-    LocalDeviceBroadcastReceiver *localDeviceReceiver;
+    ServiceDiscoveryBroadcastReceiver *receiver = nullptr;
+    LocalDeviceBroadcastReceiver *localDeviceReceiver = nullptr;
 
     QAndroidJniObject btAdapter;
     QMap<QBluetoothAddress,QPair<QBluetoothDeviceInfo,QList<QBluetoothUuid> > > sdpCache;