diff options
| -rw-r--r-- | core/btdiscovery.cpp | 13 | ||||
| -rw-r--r-- | subsurface-mobile-helper.cpp | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/core/btdiscovery.cpp b/core/btdiscovery.cpp index 281e3b314..731c4ca4f 100644 --- a/core/btdiscovery.cpp +++ b/core/btdiscovery.cpp @@ -71,17 +71,20 @@ void BTDiscovery::BTDiscoveryReDiscover() localBtDevice.hostMode() == QBluetoothLocalDevice::HostConnectable) { btPairedDevices.clear(); qDebug() << "localDevice " + localBtDevice.name() + " is valid, starting discovery"; - m_btValid = true; #else - m_btValid = false; + // for iOS we can't use the localBtDevice as iOS is BLE only + // we need to find some other way to test if Bluetooth is enabled, though + // for now just hard-code it + if (1) { #endif + m_btValid = true; #if defined(Q_OS_IOS) || (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)) discoveryAgent = new QBluetoothDeviceDiscoveryAgent(this); connect(discoveryAgent, &QBluetoothDeviceDiscoveryAgent::deviceDiscovered, this, &BTDiscovery::btDeviceDiscovered); qDebug() << "starting BLE discovery"; discoveryAgent->start(); #endif -#if defined(Q_OS_ANDROID) && defined(BT_SUPPORT) +#if defined(Q_OS_ANDROID) getBluetoothDevices(); // and add the paired devices to the internal data // So behaviour is same on Linux/Bluez stack and @@ -100,12 +103,10 @@ void BTDiscovery::BTDiscoveryReDiscover() connect(&timer, &QTimer::timeout, discoveryAgent, &QBluetoothDeviceDiscoveryAgent::stop); timer.start(3000); #endif -#if !defined(Q_OS_IOS) } else { - qDebug() << "localBtDevice isn't valid"; + qDebug() << "localBtDevice isn't valid or not connectable"; m_btValid = false; } -#endif } BTDiscovery::~BTDiscovery() diff --git a/subsurface-mobile-helper.cpp b/subsurface-mobile-helper.cpp index ae7143404..31e582020 100644 --- a/subsurface-mobile-helper.cpp +++ b/subsurface-mobile-helper.cpp @@ -59,7 +59,7 @@ void run_ui() QQmlApplicationEngine engine; KirigamiPlugin::getInstance().registerTypes(); -#if __APPLE__ +#if defined(__APPLE__) && !defined(Q_OS_IOS) // when running the QML UI on a Mac the deployment of the QML Components seems // to fail and the search path for the components is rather odd - simply the // same directory the executable was started from <bundle>/Contents/MacOS/ |