diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-05-26 14:56:49 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-05-26 14:56:49 +0200 |
| commit | f334ea4b196950c4074e7513626aabeef3d99d7f (patch) | |
| tree | ccb07d59afbb60a92b80a061645c8013aab9b96c /examples/bluetooth/btfiletransfer | |
| parent | 3910d9ffcc11db7b3beb7f2b6f0c1754103cfacb (diff) | |
| parent | 552f1a164d627720942414915fb56ae7d3b7ef22 (diff) | |
Merge branch 'dev' into btle
Conflicts:
examples/bluetooth/bluetooth.pro
src/bluetooth/bluez/bluez.pri
src/bluetooth/doc/src/bluetooth-index.qdoc
src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
src/bluetooth/qbluetoothdeviceinfo.cpp
src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
src/bluetooth/qbluetoothservicediscoveryagent_p.h
src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
Change-Id: I88b22c51a4ee95b067ef8d2b2fddb5cbff4566f8
Diffstat (limited to 'examples/bluetooth/btfiletransfer')
| -rw-r--r-- | examples/bluetooth/btfiletransfer/doc/src/btfiletransfer.qdoc | 7 | ||||
| -rw-r--r-- | examples/bluetooth/btfiletransfer/remoteselector.cpp | 11 |
2 files changed, 14 insertions, 4 deletions
diff --git a/examples/bluetooth/btfiletransfer/doc/src/btfiletransfer.qdoc b/examples/bluetooth/btfiletransfer/doc/src/btfiletransfer.qdoc index aeeffffb..53832725 100644 --- a/examples/bluetooth/btfiletransfer/doc/src/btfiletransfer.qdoc +++ b/examples/bluetooth/btfiletransfer/doc/src/btfiletransfer.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt local connectivty modules. @@ -28,6 +28,7 @@ /*! \example btfiletransfer \title Bluetooth File Transfer Example + \brief An example showing the use of Bluetooth Object Push Profile (OPP). The Bluetooth File Transfer example is an application to transfer files via a bluetooth connection. This example does not work on Android due to @@ -35,4 +36,8 @@ \image btfiletransfer-example.png + \include examples-run.qdocinc + + \sa {Qt Bluetooth} + */ diff --git a/examples/bluetooth/btfiletransfer/remoteselector.cpp b/examples/bluetooth/btfiletransfer/remoteselector.cpp index 53bf47f3..84619a4e 100644 --- a/examples/bluetooth/btfiletransfer/remoteselector.cpp +++ b/examples/bluetooth/btfiletransfer/remoteselector.cpp @@ -117,9 +117,14 @@ void RemoteSelector::startDiscovery(const QBluetoothUuid &uuid) m_discoveryAgent->setUuidFilter(uuid); m_discoveryAgent->start(); - ui->status->setText(tr("Scanning...")); - ui->busyWidget->show(); - ui->busyWidget->movie()->start(); + if (!m_discoveryAgent->isActive() || + m_discoveryAgent->error() != QBluetoothServiceDiscoveryAgent::NoError) { + ui->status->setText(tr("Cannot find remote services.")); + } else { + ui->status->setText(tr("Scanning...")); + ui->busyWidget->show(); + ui->busyWidget->movie()->start(); + } } QBluetoothServiceInfo RemoteSelector::service() const |