diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-07-13 14:27:55 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-07-13 14:27:55 +0200 |
| commit | 20949d791463e571bd3a8549933b5b91019f754f (patch) | |
| tree | 1dcd9c0c3833aeba40f074b8b26da3656868fa54 /src/bluetooth/bluetooth.pro | |
| parent | da0973e98ebd0d81523839ea255015c4a2e646a7 (diff) | |
| parent | 1de888375e3bafb44c9cc8dafce68e2b6b4f7a48 (diff) | |
| download | qtconnectivity-20949d791463e571bd3a8549933b5b91019f754f.tar.gz | |
Merge remote-tracking branch 'gerrit/dev' into btle
Adds the minimum compile requirements for the new
QBluetoothDeviceDiscoveryAgent API.
Change-Id: Idfe07bee63de9d2849ab68eb455d0be470591795
Diffstat (limited to 'src/bluetooth/bluetooth.pro')
| -rw-r--r-- | src/bluetooth/bluetooth.pro | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index b4beda67..b2b7f54c 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -109,6 +109,7 @@ config_bluez:qtHaveModule(dbus) { message("Bluez version is too old to support Bluetooth Low Energy.") message("Only classic Bluetooth will be available.") DEFINES += QT_BLUEZ_NO_BTLE + include(dummy/dummy.pri) SOURCES += \ qlowenergycontroller_p.cpp } @@ -152,14 +153,10 @@ config_bluez:qtHaveModule(dbus) { qlowenergycontroller_osx.mm \ qlowenergyservice_osx.mm - SOURCES += \ - qlowenergycontroller_p.cpp - PRIVATE_HEADERS += qbluetoothsocket_osx_p.h \ qbluetoothserver_osx_p.h \ qbluetoothtransferreply_osx_p.h \ qbluetoothtransferreply_osx_p.h \ - qbluetoothdevicediscoverytimer_osx_p.h \ qlowenergycontroller_osx_p.h SOURCES -= qbluetoothdevicediscoveryagent.cpp @@ -181,12 +178,10 @@ config_bluez:qtHaveModule(dbus) { qlowenergyservice_osx.mm PRIVATE_HEADERS += \ - qlowenergycontroller_osx_p.h \ - qbluetoothdevicediscoverytimer_osx_p.h + qlowenergycontroller_osx_p.h include(osx/osxbt.pri) SOURCES += \ - qbluetoothdevicediscoveryagent_p.cpp \ qbluetoothlocaldevice_p.cpp \ qbluetoothserviceinfo_p.cpp \ qbluetoothservicediscoveryagent_p.cpp \ |