diff options
author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-07-03 15:26:31 +0200 |
---|---|---|
committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-07-05 14:11:21 +0200 |
commit | 0fc7e18bf7a24c9408602242d51a852905dfd0da (patch) | |
tree | 00ce24a74a55d541bc322235a7ea92efd1bcd985 /src/bluetooth/qlowenergycontroller_osx.mm | |
parent | 3394807b3b0a234452b76e6295cb2362dc2c0cc0 (diff) |
Core/IO/Bluetooth - fix ambiguous conversions
... somewhat prospective fix (I do not have the new iOS yet), so far build
never failed with my current SDK.
Fixes: QTBUG-76847
Change-Id: Iab75c3cd47144cd83b679b1dbf82339e29c07bd1
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/bluetooth/qlowenergycontroller_osx.mm')
-rw-r--r-- | src/bluetooth/qlowenergycontroller_osx.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bluetooth/qlowenergycontroller_osx.mm b/src/bluetooth/qlowenergycontroller_osx.mm index 8bcdc22e..9aaee855 100644 --- a/src/bluetooth/qlowenergycontroller_osx.mm +++ b/src/bluetooth/qlowenergycontroller_osx.mm @@ -165,7 +165,7 @@ QLowEnergyControllerPrivateOSX::QLowEnergyControllerPrivateOSX(QLowEnergyControl #endif } else { centralManager.reset([[ObjCCentralManager alloc] initWith:notifier.data()]); - if (!centralManager) { + if (!centralManager.data()) { qCWarning(QT_BT_OSX) << "failed to initialize central manager"; return; } @@ -200,9 +200,9 @@ QLowEnergyControllerPrivateOSX::~QLowEnergyControllerPrivateOSX() bool QLowEnergyControllerPrivateOSX::isValid() const { #ifdef Q_OS_TVOS - return centralManager; + return centralManager.data(); #else - return centralManager || peripheralManager; + return centralManager.data() || peripheralManager.data(); #endif } |