Changeset f5adbe5 in subsurface


Ignore:
Timestamp:
Jun 1, 2017, 7:28:18 AM (3 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
ec34ebf
Parents:
02d3289
git-author:
Jan Mulder <jlmulder@…> (05/30/17 03:54:41)
git-committer:
Dirk Hohndel <dirk@…> (06/01/17 07:28:18)
Message:

Use #if defined() instead of #if

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

Signed-off-by: Jan Mulder <jlmulder@…>

Location:
mobile-widgets
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • mobile-widgets/qmlmanager.cpp

    rb9760f1 rf5adbe5  
    9090        alreadySaving(false)
    9191{
    92 #if BT_SUPPORT
     92#if defined(BT_SUPPORT)
    9393        if (localBtDevice.isValid()) {
    9494                localBtDevice.powerOn();
     
    204204}
    205205
    206 #if BT_SUPPORT
     206#if defined(BT_SUPPORT)
    207207
    208208extern void addBtUuid(QBluetoothUuid uuid);
     
    238238int QMLManager::getVendorIndex()
    239239{
    240 #if BT_SUPPORT
     240#if defined(BT_SUPPORT)
    241241        if (!btDCs.isEmpty()) {
    242242                qDebug() << "getVendorIdx" << btDCs.first().vendorIdx;
     
    249249int QMLManager::getProductIndex()
    250250{
    251 #if BT_SUPPORT
     251#if defined(BT_SUPPORT)
    252252        if (!btDCs.isEmpty()) {
    253253                qDebug() << "getProductIdx" << btDCs.first().productIdx;
  • mobile-widgets/qmlmanager.h

    rbe271e7 rf5adbe5  
    88#include <QScreen>
    99#include <QElapsedTimer>
    10 #if BT_SUPPORT
     10#if defined(BT_SUPPORT)
    1111#include <QBluetoothLocalDevice>
    1212#include <QBluetoothDeviceDiscoveryAgent>
     
    123123        Q_INVOKABLE int getProductIndex();
    124124        Q_INVOKABLE QString getBtAddress();
    125 #if BT_SUPPORT
     125#if defined(BT_SUPPORT)
    126126        void btDeviceDiscovered(const QBluetoothDeviceInfo &device);
    127127#endif
     
    208208        bool currentGitLocalOnly;
    209209        bool m_showPin;
    210 #if BT_SUPPORT
     210#if defined(BT_SUPPORT)
    211211        QBluetoothLocalDevice localBtDevice;
    212212        QBluetoothDeviceDiscoveryAgent *discoveryAgent;
Note: See TracChangeset for help on using the changeset viewer.