diff options
3 files changed, 16 insertions, 3 deletions
diff --git a/src/bluetooth/qlowenergyadvertisingparameters.cpp b/src/bluetooth/qlowenergyadvertisingparameters.cpp index 46a09c05..31111da6 100644 --- a/src/bluetooth/qlowenergyadvertisingparameters.cpp +++ b/src/bluetooth/qlowenergyadvertisingparameters.cpp @@ -132,12 +132,16 @@ public: /*! \variable QLowEnergyAdvertisingParameters::AddressInfo::address - The Bluetooth address of a remote address. + + This is the Bluetooth address of a remote device. */ /*! \variable QLowEnergyAdvertisingParameters::AddressInfo::type - The type of the address (public or private). + + The type of the address (public or private). + The \l AddressInfo default constructor initialises this value to + \l QLowEnergyController::PublicAddress. */ /*! @@ -151,6 +155,10 @@ public: \fn QLowEnergyAdvertisingParameters::AddressInfo::AddressInfo() Constructs a default constructed AddressInfo instance. + + By default the \l AddressInfo::type member is set to + \l QLowEnergyController::PublicAddress and the \l AddressInfo::address + member has a null address. */ /*! diff --git a/src/bluetooth/qlowenergyadvertisingparameters.h b/src/bluetooth/qlowenergyadvertisingparameters.h index 23e918a2..547e5798 100644 --- a/src/bluetooth/qlowenergyadvertisingparameters.h +++ b/src/bluetooth/qlowenergyadvertisingparameters.h @@ -68,7 +68,7 @@ public: struct AddressInfo { AddressInfo(const QBluetoothAddress &addr, QLowEnergyController::RemoteAddressType t) : address(addr), type(t) {} - AddressInfo() {} + AddressInfo() : type(QLowEnergyController::PublicAddress) {} QBluetoothAddress address; QLowEnergyController::RemoteAddressType type; diff --git a/tests/auto/qlowenergycontroller-gattserver/test/tst_qlowenergycontroller-gattserver.cpp b/tests/auto/qlowenergycontroller-gattserver/test/tst_qlowenergycontroller-gattserver.cpp index 8b11e5a7..f487db00 100644 --- a/tests/auto/qlowenergycontroller-gattserver/test/tst_qlowenergycontroller-gattserver.cpp +++ b/tests/auto/qlowenergycontroller-gattserver/test/tst_qlowenergycontroller-gattserver.cpp @@ -114,6 +114,11 @@ void TestQLowEnergyControllerGattServer::advertisingParameters() QCOMPARE(params.whiteList(), whiteList); QCOMPARE(params.filterPolicy(), QLowEnergyAdvertisingParameters::UseWhiteListForConnecting); QVERIFY(params != QLowEnergyAdvertisingParameters()); + + // verify default ctor + QLowEnergyAdvertisingParameters::AddressInfo info; + QVERIFY(info.address == QBluetoothAddress()); + QVERIFY(info.type == QLowEnergyController::PublicAddress); } void TestQLowEnergyControllerGattServer::advertisingData() |