Initialize the manual bttestui application member variables

Helps in manual testing when isolating individual class instantiations

Pick-to: 6.2 6.3
Change-Id: I11f0b95031e218986317f952aeebafca4c24d6a6
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

2 files changed, 5 insertions, 10 deletions

diff --git a/tests/bttestui/btlocaldevice.cpp b/tests/bttestui/btlocaldevice.cpp
index da677e70..2cb74e13 100644
--- a/tests/bttestui/btlocaldevice.cpp
+++ b/tests/bttestui/btlocaldevice.cpp
@@ -94,11 +94,6 @@ BtLocalDevice::BtLocalDevice(QObject *parent)
         server = new QBluetoothServer(SOCKET_PROTOCOL, this);
         connect(server, &QBluetoothServer::newConnection, this, &BtLocalDevice::serverNewConnection);
         connect(server, &QBluetoothServer::errorOccurred, this, &BtLocalDevice::serverError);
-    } else {
-        deviceAgent = nullptr;
-        serviceAgent = nullptr;
-        socket = nullptr;
-        server = nullptr;
     }
 }
 
diff --git a/tests/bttestui/btlocaldevice.h b/tests/bttestui/btlocaldevice.h
index 4f30defc..44821970 100644
--- a/tests/bttestui/btlocaldevice.h
+++ b/tests/bttestui/btlocaldevice.h
@@ -113,11 +113,11 @@ public slots:
 private:
     void dumpLocalDevice(QBluetoothLocalDevice *dev);
 
-    QBluetoothLocalDevice *localDevice;
-    QBluetoothDeviceDiscoveryAgent *deviceAgent;
-    QBluetoothServiceDiscoveryAgent *serviceAgent;
-    QBluetoothSocket *socket;
-    QBluetoothServer *server;
+    QBluetoothLocalDevice *localDevice = nullptr;
+    QBluetoothDeviceDiscoveryAgent *deviceAgent = nullptr;
+    QBluetoothServiceDiscoveryAgent *serviceAgent = nullptr;
+    QBluetoothSocket *socket = nullptr;
+    QBluetoothServer *server = nullptr;
     QList<QBluetoothSocket *> serverSockets;
     QBluetoothServiceInfo serviceInfo;