diff options
author | Alex Blasche <alexander.blasche@digia.com> | 2014-06-27 11:47:22 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@digia.com> | 2014-06-27 11:47:22 +0200 |
commit | e31df00987b6d9c8558ceb812bb68be71106d773 (patch) | |
tree | a8a259477410620f8f5f30fa8c2e4c900496d15a /tests | |
parent | 7beb4375483f74cc5be501dbcd91c82a80178936 (diff) | |
parent | 094be0786f75ed33564c6096778510dab4500eb8 (diff) |
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
Diffstat (limited to 'tests')
-rw-r--r-- | tests/bttestui/btlocaldevice.cpp | 2 |
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; } } |