summaryrefslogtreecommitdiffstats
path: root/examples/bluetooth/lowenergyscanner
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-02-18 20:31:53 +0100
committerLiang Qi <liang.qi@qt.io>2018-02-18 20:32:39 +0100
commit7bcc5dc2c323b2ed120fb7bf695286f6a01c44d0 (patch)
treee8b6498d72faeb60e04246a7d1646efe0317151d /examples/bluetooth/lowenergyscanner
parentb295f466b8a9cfc756ed22794e3b35ab20e20dbb (diff)
parenta7be018dfae73e4e2a68fd82e775d05d52aea983 (diff)
Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts: .qmake.conf Change-Id: I5dcafa278c0c51bc3d540ab46320e5a21ef51115
Diffstat (limited to 'examples/bluetooth/lowenergyscanner')
-rw-r--r--examples/bluetooth/lowenergyscanner/assets/Services.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/bluetooth/lowenergyscanner/assets/Services.qml b/examples/bluetooth/lowenergyscanner/assets/Services.qml
index e22d1db3..68d7d447 100644
--- a/examples/bluetooth/lowenergyscanner/assets/Services.qml
+++ b/examples/bluetooth/lowenergyscanner/assets/Services.qml
@@ -115,8 +115,8 @@ Rectangle {
MouseArea {
anchors.fill: parent
onClicked: {
- device.connectToService(modelData.serviceUuid);
pageLoader.source = "Characteristics.qml";
+ device.connectToService(modelData.serviceUuid);
}
}