diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-09-29 22:39:07 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-09-30 08:09:37 -0700 |
| commit | 1f59629a76b0acb9cf6a504e7532839b33335f47 (patch) | |
| tree | c26b18f349300f19d36496bb7c58a1229432346f /core | |
| parent | d3d06bc580b2a344806396622edd6b7adbdd08cc (diff) | |
| download | subsurface-1f59629a76b0acb9cf6a504e7532839b33335f47.tar.gz | |
Bluetooth: use standard Qt code on Windows
We shouldn't need our hand crafted code anymore.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core')
| -rw-r--r-- | core/btdiscovery.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/btdiscovery.cpp b/core/btdiscovery.cpp index d938aca70..4d46eefde 100644 --- a/core/btdiscovery.cpp +++ b/core/btdiscovery.cpp @@ -31,8 +31,8 @@ static dc_descriptor_t *getDeviceType(QString btName) } if (btName.startsWith("Predator") || - btName.startsWith("Petrel") || - btName.startsWith("Perdix") || + btName.startsWith("Petrel") || + btName.startsWith("Perdix") || btName.startsWith("Teric")) { vendor = "Shearwater"; if (btName.startsWith("Petrel")) product = "Petrel"; // or petrel 2? @@ -98,7 +98,7 @@ void BTDiscovery::BTDiscoveryReDiscover() if (1) { #endif m_btValid = true; -#if defined(Q_OS_IOS) || (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)) +#if defined(Q_OS_WIN) || 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"; @@ -178,7 +178,7 @@ void BTDiscovery::btDeviceDiscovered(const QBluetoothDeviceInfo &device) qDebug() << id.toByteArray(); } -#if defined(Q_OS_IOS) +#if defined(Q_OS_IOS) || defined(Q_OS_WIN) // On Desktop this is called when "Save" button is clicked. All // DeviceInfo are stored as data on the ui list items. // On mobile (iOS) the current ConnectionListModel does not support |