diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-10-10 13:38:14 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-11 15:57:06 +0200 |
| commit | aa5f17bda3c6c958563c75bf74553c20cd18d6df (patch) | |
| tree | be74e8d39bb1157443f0ed7ad18b7de160584bc6 /examples/bluetooth | |
| parent | d899ab782c2cb3f73a48d4b5bce072c27996f573 (diff) | |
BluetoothDiscoveryModel API fixes
- rename signal: newServiceDiscovered -> serviceDiscovered
- rename signal: newDeviceDiscovered -> deviceDisovered
- add parameter to deviceDiscovered signal
- improve documentation for above signals
- minor example fixes
Task-number: QTBUG-33678
Change-Id: I2f9223250ef844564c3e76a85adc25322867fd6e
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'examples/bluetooth')
| -rw-r--r-- | examples/bluetooth/scanner/scanner.qml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/examples/bluetooth/scanner/scanner.qml b/examples/bluetooth/scanner/scanner.qml index 52182362..7ae0e28e 100644 --- a/examples/bluetooth/scanner/scanner.qml +++ b/examples/bluetooth/scanner/scanner.qml @@ -52,7 +52,8 @@ Item { running: true discoveryMode: BluetoothDiscoveryModel.DeviceDiscovery onDiscoveryModeChanged: console.log("Discovery mode: " + discoveryMode) - onNewServiceDiscovered: console.log("Found new service " + service.deviceAddress + " " + service.deviceName + " " + service.serviceName); + onServiceDiscovered: console.log("Found new service " + service.deviceAddress + " " + service.deviceName + " " + service.serviceName); + onDeviceDiscovered: console.log("New device: " + device) } Rectangle { @@ -86,6 +87,9 @@ Item { width: top.width anchors.top: busy.bottom anchors.bottom: buttonGroup.top + anchors.bottomMargin: 10 + anchors.topMargin: 10 + clip: true model: btModel delegate: Rectangle { @@ -128,7 +132,6 @@ Item { if (s.serviceName) { str += "<br>Service: " + s.serviceName; } if (s.serviceDescription) { str += "<br>Description: " + s.serviceDescription; } if (s.serviceProtocol) { str += "<br>Protocol: " + s.serviceProtocol; } - if (s.servicePort) { str += "<br>Port: " + s.servicePort; } return str; } } |