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>

5 files changed, 5 insertions, 5 deletions

diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro
index 601e2bcd..03cbb8d0 100644
--- a/src/bluetooth/bluetooth.pro
+++ b/src/bluetooth/bluetooth.pro
@@ -78,7 +78,7 @@ SOURCES += \
     qlowenergycontroller.cpp \
     qlowenergyserviceprivate.cpp
 
-qtConfig(bluez):qtHaveModule(dbus) {
+qtConfig(bluez) {
     QT_FOR_PRIVATE += dbus
     DEFINES += QT_BLUEZ_BLUETOOTH
 
diff --git a/src/bluetooth/configure.json b/src/bluetooth/configure.json
index aebb3b3f..e348030b 100644
--- a/src/bluetooth/configure.json
+++ b/src/bluetooth/configure.json
@@ -29,7 +29,7 @@
     "features": {
         "bluez": {
             "label": "BlueZ",
-            "condition": "libs.bluez",
+            "condition": "libs.bluez && features.dbus",
             "output": [ "publicFeature" ]
         },
         "bluez_le": {
diff --git a/src/src.pro b/src/src.pro
index 256e7363..dba9de4b 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -23,7 +23,7 @@ qtHaveModule(quick) {
 
 include($$OUT_PWD/bluetooth/qtbluetooth-config.pri)
 QT_FOR_CONFIG += bluetooth
-qtConfig(bluez):qtHaveModule(dbus) {
+qtConfig(bluez) {
     sdpscanner.subdir = tools/sdpscanner
     sdpscanner.depends = bluetooth
     SUBDIRS += sdpscanner
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
 }