From aa5f17bda3c6c958563c75bf74553c20cd18d6df Mon Sep 17 00:00:00 2001
From: Alex Blasche <alexander.blasche@digia.com>
Date: Thu, 10 Oct 2013 13:38:14 +0200
Subject: 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>
---
 examples/bluetooth/scanner/scanner.qml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'examples')

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;
                         }
                     }
-- 
cgit v1.2.3