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 /src/bluetooth/qbluetoothlocaldevice.cpp | |
| 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 'src/bluetooth/qbluetoothlocaldevice.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothlocaldevice.cpp b/src/bluetooth/qbluetoothlocaldevice.cpp index c5b68645..78899d0a 100644 --- a/src/bluetooth/qbluetoothlocaldevice.cpp +++ b/src/bluetooth/qbluetoothlocaldevice.cpp @@ -124,8 +124,16 @@ QBluetoothLocalDevice::~QBluetoothLocalDevice() } /*! - Returns true if the QBluetoothLocalDevice represents an available local Bluetooth device; + Returns \c true if the QBluetoothLocalDevice represents an available local Bluetooth device; otherwise return false. + + If the local Bluetooth adapter represented by an instance of this class + is removed from the system (e.g. removal of the underlying Bluetooth dongle) + then this instance will become invalid. An already invalid QBluetoothLocalDevice instance + remains invalid even if the same Bluetooth adapter is returned to + the system. + + \sa allDevices() */ bool QBluetoothLocalDevice::isValid() const { |