mirror of
https://github.com/subsurface/subsurface.git
synced 2025-01-19 14:25:27 +00:00
iOS BLE support: no localBtDevice, go straight to discovery
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
f940104a33
commit
526da269cc
1 changed files with 8 additions and 1 deletions
|
@ -100,14 +100,19 @@ BTDiscovery::BTDiscovery(QObject *parent)
|
|||
}
|
||||
m_instance = this;
|
||||
#if defined(BT_SUPPORT)
|
||||
#if !defined(Q_OS_IOS)
|
||||
if (localBtDevice.isValid() &&
|
||||
localBtDevice.hostMode() == QBluetoothLocalDevice::HostConnectable) {
|
||||
btPairedDevices.clear();
|
||||
qDebug() << "localDevice " + localBtDevice.name() + " is valid, starting discovery";
|
||||
m_btValid = true;
|
||||
#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
|
||||
#else
|
||||
m_btValid = false;
|
||||
#endif
|
||||
#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)
|
||||
|
@ -126,11 +131,13 @@ BTDiscovery::BTDiscovery(QObject *parent)
|
|||
#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
|
||||
discoveryAgent->stop();
|
||||
#endif
|
||||
#if !defined(Q_OS_IOS)
|
||||
} else {
|
||||
qDebug() << "localBtDevice isn't valid";
|
||||
m_btValid = false;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
BTDiscovery::~BTDiscovery()
|
||||
|
|
Loading…
Add table
Reference in a new issue