summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2014-04-24 14:30:50 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-25 08:39:58 +0200
commit78022ee2e2ee417efa3fb593ea0fb0a3185caa3b (patch)
treed216571698a7000fea06a0467b0c466851931f09
parent18a00cc7b236dd959cb6c2cb526c4a7b27a01de9 (diff)
Fix a renamed qdoc tag and improve grammar/spelling
Change-Id: Iee11fdfe3b57fbe94d7e3362454851867d25e98a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
-rw-r--r--src/bluetooth/doc/src/bluetooth-overview.qdoc4
-rw-r--r--src/bluetooth/qbluetoothdevicediscoveryagent.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/bluetooth/doc/src/bluetooth-overview.qdoc b/src/bluetooth/doc/src/bluetooth-overview.qdoc
index 2afd2bd8..f8040fb8 100644
--- a/src/bluetooth/doc/src/bluetooth-overview.qdoc
+++ b/src/bluetooth/doc/src/bluetooth-overview.qdoc
@@ -51,7 +51,7 @@
\section1 Retrieving Local Device Information
The Qt Bluetooth API has three main purposes. The first one is to
- obtain local and remote device information. The first steps in retrieving device information is
+ obtain local and remote device information. The first steps in retrieving device information are
to check if Bluetooth is available on the device and read the local device address and name.
QBluetoothLocalDevice is the class that provides all of this information. Additionally you can use it
to turn Bluetooth on/off, set the visibility of the device and determine the current connections.
@@ -65,7 +65,7 @@
your own and fill them with data, the easier way is to use the QBluetoothDeviceDiscoveryAgent to
start an automated search for visible Bluetooth devices within the connectable range.
- \snippet doc_src_qtbluetooth.cpp discovery
+ \snippet doc_src_qtbluetooth.cpp device_discovery
\section1 Pushing Files to Remote Devices
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent.cpp
index fab8f965..6b959c5f 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent.cpp
@@ -91,8 +91,8 @@ QT_BEGIN_NAMESPACE
support it, GeneralUnlimitedInquiry will be used instead. Setting LimitedInquiry is useful
for multi-player Bluetooth-based games that needs faster communication between the devices.
The phone scans for devices in LimitedInquiry and Service Discovery is done on one or two devices
- to speed up the service scan. After the game has connected to the device it intends to,the device
- returns to GeneralUnilimitedInquiry.
+ to speed up the service scan. After the game has connected to the device it intended to,
+ the device returns to GeneralUnlimitedInquiry.
*/
/*!