diff options
author | Andre de la Rocha <andre.rocha@qt.io> | 2019-06-06 13:55:29 +0200 |
---|---|---|
committer | Andre de la Rocha <andre.rocha@qt.io> | 2019-06-06 13:55:29 +0200 |
commit | bbd5a988592e31b5f8ec0a111e7fea30c222f0ec (patch) | |
tree | e0d88cc8f106f46a24489a7b8fee19f627898146 /examples/bluetooth/lowenergyscanner | |
parent | 6ee559eefc3fee286eb92a5f5d8b8fe004d0dc42 (diff) |
Update Bluetooth examples for high-DPI displays and nullptr
This change sets the Qt::AA_EnableHighDpiScaling application attribute.
It also uses nullptr to initialize pointers and adds a trivial
optimization to the low energy scanner example.
Change-Id: Ia923573ad78108a2a6a72be4c0948ea97a7ec094
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'examples/bluetooth/lowenergyscanner')
-rw-r--r-- | examples/bluetooth/lowenergyscanner/device.cpp | 12 | ||||
-rw-r--r-- | examples/bluetooth/lowenergyscanner/main.cpp | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/examples/bluetooth/lowenergyscanner/device.cpp b/examples/bluetooth/lowenergyscanner/device.cpp index 82179db1..d860457e 100644 --- a/examples/bluetooth/lowenergyscanner/device.cpp +++ b/examples/bluetooth/lowenergyscanner/device.cpp @@ -152,12 +152,12 @@ void Device::scanServices(const QString &address) // We need the current device for service discovery. for (auto d: qAsConst(devices)) { - auto device = qobject_cast<DeviceInfo *>(d); - if (!device) - continue; - - if (device->getAddress() == address ) - currentDevice.setDevice(device->getDevice()); + if (auto device = qobject_cast<DeviceInfo *>(d)) { + if (device->getAddress() == address ) { + currentDevice.setDevice(device->getDevice()); + break; + } + } } if (!currentDevice.getDevice().isValid()) { diff --git a/examples/bluetooth/lowenergyscanner/main.cpp b/examples/bluetooth/lowenergyscanner/main.cpp index 351ab13a..f223b028 100644 --- a/examples/bluetooth/lowenergyscanner/main.cpp +++ b/examples/bluetooth/lowenergyscanner/main.cpp @@ -59,6 +59,7 @@ int main(int argc, char *argv[]) { //QLoggingCategory::setFilterRules(QStringLiteral("qt.bluetooth* = true")); + QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); Device d; |