diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:05:27 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:05:27 +0100 |
| commit | 653c3b0df0f9b8b0a9947173dc0eb571e4a772ab (patch) | |
| tree | 282a17a41cd178c6779d84553e4e67ccf464a792 /src/imports | |
| parent | 40ac14e13b0aa07124c6ae9ef8eacfe6d8550684 (diff) | |
| parent | a6adc6b0bf3fcbe2cf807573797fe80b4ec62957 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: If8694cc568502c21a3f7138d91cd67121cd32835
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp | 8 | ||||
| -rw-r--r-- | src/imports/bluetooth/qdeclarativebluetoothservice.cpp | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp index bec7b717..842d042d 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp +++ b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp @@ -270,9 +270,11 @@ QVariant QDeclarativeBluetoothDiscoveryModel::data(const QModelIndex &index, int /*! \qmlsignal BluetoothDiscoveryModel::serviceDiscovered(BluetoothService service) - This handler is called when a new service is discovered. The \a service + This signal is emitted when a new service is discovered. The \a service parameter contains the service details. + The corresponding handler is \c onServiceDiscovered. + \sa BluetoothService */ @@ -301,8 +303,10 @@ void QDeclarativeBluetoothDiscoveryModel::serviceDiscovered(const QBluetoothServ /*! \qmlsignal BluetoothDiscoveryModel::deviceDiscovered(string device) - This handler is called when a new device is discovered. \a device contains + This signal is emitted when a new device is discovered. \a device contains the Bluetooth address of the discovred device. + + The corresponding handler is \c onDeviceDiscovered. */ void QDeclarativeBluetoothDiscoveryModel::deviceDiscovered(const QBluetoothDeviceInfo &device) diff --git a/src/imports/bluetooth/qdeclarativebluetoothservice.cpp b/src/imports/bluetooth/qdeclarativebluetoothservice.cpp index 6d4e3dc0..adff13db 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothservice.cpp +++ b/src/imports/bluetooth/qdeclarativebluetoothservice.cpp @@ -69,7 +69,7 @@ /*! \qmlsignal BluetoothService::detailsChanged() - This handler is called when any of the following properties changes: + This signal is emitted when any of the following properties changes: \list \li deviceAddress @@ -80,6 +80,8 @@ \li serviceProtocol \li serviceUuid \endlist + + The corresponding handler is \c onDetailsChanged. */ Q_DECLARE_LOGGING_CATEGORY(QT_BT_QML) |