diff options
author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-07-11 14:25:49 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-07-11 14:28:03 +0200 |
commit | d20e2e84ec2edd770c830fe2c399b4c76321d187 (patch) | |
tree | 5414ce5679dee0095a9f9dd4bca1a7e47213c919 /src/bluetooth/bluetooth.pro | |
parent | 7d4f6cab9fc5c8a8061b13e9b15bacf17e7e7b4c (diff) | |
parent | a8a1a97b9a3f68245431a94ff670b91b340770b2 (diff) | |
download | qtconnectivity-d20e2e84ec2edd770c830fe2c399b4c76321d187.tar.gz |
Merge remote-tracking branch 'gerrit/5.6' into 5.7
Change-Id: Ifbb36469f4a325b1b783cb3b018d7793680a9055
Diffstat (limited to 'src/bluetooth/bluetooth.pro')
-rw-r--r-- | src/bluetooth/bluetooth.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index a614516f..1857e983 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 } @@ -186,7 +187,6 @@ config_bluez:qtHaveModule(dbus) { include(osx/osxbt.pri) SOURCES += \ - qbluetoothdevicediscoveryagent_p.cpp \ qbluetoothlocaldevice_p.cpp \ qbluetoothserviceinfo_p.cpp \ qbluetoothservicediscoveryagent_p.cpp \ |