From bcf1167ccb52341d72e6e2921077d2244803ee8d Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Tue, 18 Apr 2017 16:54:55 +0200 Subject: Fix build for -no-feature-concurrent Change-Id: I57b18167dacb776a00d406e3faba6e780c764771 Reviewed-by: Paul Olav Tvete --- src/bluetooth/bluetooth.pro | 3 ++- src/bluetooth/configure.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index 6b23325f..40b14a84 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -1,6 +1,5 @@ TARGET = QtBluetooth QT = core core-private -QT_PRIVATE = concurrent QMAKE_DOCS = $$PWD/doc/qtbluetooth.qdocconf @@ -79,6 +78,7 @@ SOURCES += \ qlowenergyserviceprivate.cpp qtConfig(bluez) { + QT_PRIVATE = concurrent QT_FOR_PRIVATE += dbus include(bluez/bluez.pri) @@ -134,6 +134,7 @@ qtConfig(bluez) { qlowenergycontroller_android.cpp } else:osx { + QT_PRIVATE = concurrent DEFINES += QT_OSX_BLUETOOTH LIBS_PRIVATE += -framework Foundation -framework IOBluetooth diff --git a/src/bluetooth/configure.json b/src/bluetooth/configure.json index e348030b..a1e65000 100644 --- a/src/bluetooth/configure.json +++ b/src/bluetooth/configure.json @@ -29,7 +29,7 @@ "features": { "bluez": { "label": "BlueZ", - "condition": "libs.bluez && features.dbus", + "condition": "libs.bluez && features.concurrent && features.dbus", "output": [ "publicFeature" ] }, "bluez_le": { -- cgit v1.2.3