FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use #if defined() instead of #if

Browse Source 
qtcreator (4.3.0) got confused whether BT_SUPPORT was defined. Using
work as expected.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder
2017-05-30 12:54:41 +02:00
committed by Dirk Hohndel
parent 02d3289bbf
commit f5adbe5662
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mobile-widgets/qmlmanager.h
View File

@@ -7,7 +7,7 @@
#include <QNetworkAccessManager>
#include <QScreen>
#include <QElapsedTimer>
#if BT_SUPPORT
#if defined(BT_SUPPORT)
#include <QBluetoothLocalDevice>
#include <QBluetoothDeviceDiscoveryAgent>
#include <QBluetoothUuid>
@@ -122,7 +122,7 @@ public:
Q_INVOKABLE int getVendorIndex();
Q_INVOKABLE int getProductIndex();
Q_INVOKABLE QString getBtAddress();
#if BT_SUPPORT
#if defined(BT_SUPPORT)
void btDeviceDiscovered(const QBluetoothDeviceInfo &device);
#endif
@@ -207,7 +207,7 @@ private:
bool checkDepth(DiveObjectHelper *myDive, struct dive *d, QString depth);
bool currentGitLocalOnly;
bool m_showPin;
#if BT_SUPPORT
#if defined(BT_SUPPORT)
QBluetoothLocalDevice localBtDevice;
QBluetoothDeviceDiscoveryAgent *discoveryAgent;
struct btVendorProduct {