Merge branch '5.3' into dev

Conflicts:
	.qmake.conf
	src/bluetooth/qbluetoothlocaldevice_bluez.cpp
	src/bluetooth/qbluetoothlocaldevice_p.h
	src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp

Change-Id: Ifb0c01eb8bffbffcd2416ea8d7bf1d36eb1c70f2

1 files changed, 2 insertions, 0 deletions

diff --git a/tests/bttestui/btlocaldevice.cpp b/tests/bttestui/btlocaldevice.cpp
index a30e2406..92446fd0 100644
--- a/tests/bttestui/btlocaldevice.cpp
+++ b/tests/bttestui/btlocaldevice.cpp
@@ -104,6 +104,8 @@ BtLocalDevice::BtLocalDevice(QObject *parent) :
     } else {
         deviceAgent = 0;
         serviceAgent = 0;
+        socket = 0;
+        server = 0;
     }
 }