diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-04-05 10:29:38 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-04-05 12:58:31 +0000 |
| commit | 24887247fff82fb328d6b907d756840ef4d844ca (patch) | |
| tree | ddd5fe82166a1d693cc555484dca6a5f703b4e9d /tests | |
| parent | 6520f8af711a9b61b194d163bb8f1db53b514ef6 (diff) | |
The BlueZ feature implies that QtDBus is enabled
The QtBluetooth library only builds the bluez backend when qtdbus is
enabled. Previously it was possible that dbus was disabled but the bluez
feature flag is still set. This patch prevents this gap by directly
binding the bluez feature to the dbus feature.
Change-Id: I173d51f27f5b1a78241548617f602830fec7bb14
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qbluetoothsocket/qbluetoothsocket.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro b/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro index 96880930..cb7b4179 100644 --- a/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro +++ b/tests/auto/qbluetoothdevicediscoveryagent/qbluetoothdevicediscoveryagent.pro @@ -5,6 +5,6 @@ CONFIG += testcase QT = core concurrent bluetooth-private testlib osx:QT += widgets -qtConfig(bluez):qtHaveModule(dbus) { +qtConfig(bluez) { DEFINES += QT_BLUEZ_BLUETOOTH } diff --git a/tests/auto/qbluetoothsocket/qbluetoothsocket.pro b/tests/auto/qbluetoothsocket/qbluetoothsocket.pro index 8c9b2acb..b73d9311 100644 --- a/tests/auto/qbluetoothsocket/qbluetoothsocket.pro +++ b/tests/auto/qbluetoothsocket/qbluetoothsocket.pro @@ -13,6 +13,6 @@ osx { DEFINES += QT_OSX_BLUETOOTH } else: android { DEFINES += QT_ANDROID_BLUETOOTH -} else: qtConfig(bluez):qtHaveModule(dbus) { +} else: qtConfig(bluez) { DEFINES += QT_BLUEZ_BLUETOOTH } |