diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-27 18:28:25 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-27 18:28:25 +0100 |
| commit | 3964a4a29d1237404bf554bb0b64d7de1d49155c (patch) | |
| tree | 927c389d624826e08a1e293ef3fa3d2d4dc39ee1 /examples/bluetooth/lowenergyscanner/assets/Characteristics.qml | |
| parent | 0e3046f29b0e86affeb33c8f6687618cfd1dfae2 (diff) | |
| parent | 73563f571e6dfd37a0e4cf90f4679d9901b9233c (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I6c1eabeea1b3397803e285d13cef147220ff5aa4
Diffstat (limited to 'examples/bluetooth/lowenergyscanner/assets/Characteristics.qml')
| -rw-r--r-- | examples/bluetooth/lowenergyscanner/assets/Characteristics.qml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/bluetooth/lowenergyscanner/assets/Characteristics.qml b/examples/bluetooth/lowenergyscanner/assets/Characteristics.qml index ac3b7151..8e6e2868 100644 --- a/examples/bluetooth/lowenergyscanner/assets/Characteristics.qml +++ b/examples/bluetooth/lowenergyscanner/assets/Characteristics.qml @@ -141,10 +141,11 @@ Rectangle { id: menu anchors.bottom: parent.bottom menuWidth: parent.width - menuText: "Scanning" + menuText: device.update menuHeight: (parent.height/6) onButtonClick: { pageLoader.source = "Services.qml" + device.update = "Back" } } } |