summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2014-10-30 13:35:00 +0100
committerAlex Blasche <alexander.blasche@digia.com>2014-10-30 15:17:43 +0100
commite3a6af2fdb25ca8087a92fa506c8a00b786c95cc (patch)
treed1ea292d18abe92190b88866de92acaab9e48663 /src/bluetooth/qbluetoothservicediscoveryagent_osx.mm
parent096ad7b4b7039ba8d5e8b4613127f6a80a6ec5ae (diff)
Fix qdoc warnings & adds missing changelog entry for recent API change
1.) Duplicated class documentation in service discovery agent code 2.) Added missing reference to "\a uuid" parameter in new QBluetoothDeviceInfo::setDeviceUuid() [ChangeLog][QtBluetooth][QBluetoothDeviceInfo] New deviceUuid attribute added to QBluetoothDeviceInfo Change-Id: I7f87d7b95e28b435cb646d284eb447dbdccf0c90 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothservicediscoveryagent_osx.mm')
-rw-r--r--src/bluetooth/qbluetoothservicediscoveryagent_osx.mm8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm b/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm
index 21744f0c..117f3880 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm
@@ -450,7 +450,7 @@ QList<QBluetoothServiceInfo> QBluetoothServiceDiscoveryAgent::discoveredServices
return d_ptr->discoveredServices;
}
-/*!
+/*
Sets the UUID filter to \a uuids. Only services matching the UUIDs in \a uuids will be
returned.
@@ -463,7 +463,7 @@ void QBluetoothServiceDiscoveryAgent::setUuidFilter(const QList<QBluetoothUuid>
d_ptr->uuidFilter = uuids;
}
-/*!
+/*
This is an overloaded member function, provided for convenience.
Sets the UUID filter to a list containing the single element \a uuid.
@@ -476,7 +476,7 @@ void QBluetoothServiceDiscoveryAgent::setUuidFilter(const QBluetoothUuid &uuid)
d_ptr->uuidFilter.append(uuid);
}
-/*!
+/*
Returns the UUID filter.
\sa setUuidFilter()
@@ -486,7 +486,7 @@ QList<QBluetoothUuid> QBluetoothServiceDiscoveryAgent::uuidFilter() const
return d_ptr->uuidFilter;
}
-/*!
+/*
Sets the remote device address to \a address. If \a address is default constructed,
services will be discovered on all contactable Bluetooth devices. A new remote
address can only be set while there is no service discovery in progress; otherwise