summaryrefslogtreecommitdiffstats
path: root/src/settingsui
diff options
context:
space:
mode:
authorSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-11-13 09:28:21 +0200
committerSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-11-22 10:42:26 +0000
commit9c9281bb05f785451d276f0d3145029ab6fb8a2f (patch)
treea50888ca629a00ab9e4eb42c400b86ac4de172b5 /src/settingsui
parent219777455e401139d522c6129c90b7a91588d397 (diff)
Fix bluetooth settings
- Hide "Scanning" text if bluetooth is powered off during scanning - Don't create duplicate entries of devices when scanning again - List devices in alphabetically sorted order - Don't initiate new scan if it's already going on Task-number: QTBUG-60084 Change-Id: I009d66694e3bcfe7419a5f5e01bfd253d7aa4cc8 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/settingsui')
-rw-r--r--src/settingsui/bluetooth/Bluetooth.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/settingsui/bluetooth/Bluetooth.qml b/src/settingsui/bluetooth/Bluetooth.qml
index e89476f..4c82904 100644
--- a/src/settingsui/bluetooth/Bluetooth.qml
+++ b/src/settingsui/bluetooth/Bluetooth.qml
@@ -68,7 +68,7 @@ Item {
color: "white"
text: "Scanning"
font.family: appFont
- opacity: BtDevice.scanning ? 1.0 : 0.0
+ opacity: (BtDevice.scanning && BtDevice.powered) ? 1.0 : 0.0
visible: opacity > 0
Behavior on opacity {
NumberAnimation {duration: 150}