summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qbluetoothservicediscoveryagent.cpp
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2014-08-21 12:15:20 +0200
committerAlex Blasche <alexander.blasche@digia.com>2014-09-03 08:38:55 +0200
commit5a694018992051a3c99339d5860eda4bbb703275 (patch)
tree6e9cf5f194873509fac7abc3c730184b929cb0ef /src/bluetooth/qbluetoothservicediscoveryagent.cpp
parentda7ccfcd08c587283f4656b30ca15011ebdbeb5c (diff)
Remove QLowEnergyServiceInfo
There is no need for this class anymore as QBluetoothServiceInfo covers the same information. Change-Id: I411a8abb68b34a3a4893a67ee9fac096f44bbd62 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothservicediscoveryagent.cpp')
-rw-r--r--src/bluetooth/qbluetoothservicediscoveryagent.cpp27
1 files changed, 18 insertions, 9 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.cpp b/src/bluetooth/qbluetoothservicediscoveryagent.cpp
index 4c752356..57c7c2b3 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent.cpp
@@ -46,7 +46,10 @@ QT_BEGIN_NAMESPACE
\brief The QBluetoothServiceDiscoveryAgent class enables you to query for
Bluetooth services.
- To query the services provided by all contactable Bluetooth devices:
+ The discovery process relies on the Bluetooth Service Discovery Process (SDP).
+ The following steps are required to query the services provided by all contactable
+ Bluetooth devices:
+
\list
\li create an instance of QBluetoothServiceDiscoveryAgent,
\li connect to either the serviceDiscovered() or finished() signals,
@@ -55,16 +58,22 @@ QT_BEGIN_NAMESPACE
\snippet doc_src_qtbluetooth.cpp service_discovery
- By default a minimal service discovery is performed. In this mode, the QBluetotohServiceInfo
- objects returned are guaranteed to contain only device and service UUID information. Depending
+ By default a minimal service discovery is performed. In this mode, the returned \l QBluetoothServiceInfo
+ objects are guaranteed to contain only device and service UUID information. Depending
on platform and device capabilities, other service information may also be available. For most
use cases this is adequate as QBluetoothSocket::connectToService() will perform additional
- discovery if required. If full service information is required, pass \l FullDiscovery as the
+ discovery if required. If the full service information is required, pass \l FullDiscovery as the
discoveryMode parameter to start().
This class may internally utilize \l QBluetoothDeviceDiscoveryAgent to find unknown devices.
- \sa QBluetoothDeviceDiscoveryAgent
+ The service discovery may find Bluetooth Low Energy services too if the target device
+ is a combination of a classic and Low Energy device. Those devices are required to advertise
+ their Low Energy services via SDP. If the target device only supports Bluetooth Low
+ Energy services, it is likely to not advertise them via SDP. The \l QLowEnergyController class
+ should be utilized to perform the service discovery on Low Energy devices.
+
+ \sa QBluetoothDeviceDiscoveryAgent, QLowEnergyController
*/
/*!
@@ -94,12 +103,12 @@ QT_BEGIN_NAMESPACE
\fn QBluetoothServiceDiscoveryAgent::serviceDiscovered(const QBluetoothServiceInfo &info)
This signal is emitted when the Bluetooth service described by \a info is discovered.
-*/
-/*!
- \fn QBluetoothServiceDiscoveryAgent::serviceDiscovered(const QLowEnergyServiceInfo &info)
+ \note The passed \l QBluetoothServiceInfo parameter may contain a Bluetooth Low Energy
+ service if the target device advertises the service via SDP. This is required from device
+ which support both, classic Bluetooth (BaseRate) and Low Energy services.
- This signal is emitted when the Bluetooth Low Energy service described by \a info is discovered.
+ \sa QBluetoothDeviceInfo::coreConfigurations()
*/
/*!