diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2018-02-20 09:39:56 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2018-02-20 09:39:56 +0100 |
| commit | a34a645e89aea7f19d2ed14af00099768a07a6be (patch) | |
| tree | 700efe52fc2ba6345b26316188fb0cfbc8e49a15 /src/bluetooth/bluetooth.pro | |
| parent | a18338b552d45b6877e89221a5d6205081a54308 (diff) | |
| parent | b87affb8b2353af57ed5e736d82d67eb56ea1235 (diff) | |
Merge remote-tracking branch 'gerrit/dev' into win
Change-Id: I4e86dcfe5088b0bd5087de309c435250c76d4718
Diffstat (limited to 'src/bluetooth/bluetooth.pro')
| -rw-r--r-- | src/bluetooth/bluetooth.pro | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index 372d9e75..b6aa4f9f 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -88,6 +88,9 @@ qtConfig(bluez) { QT_PRIVATE = concurrent QT_FOR_PRIVATE += dbus + # do not link against QtNetwork but use inline qt_safe_* functions + INCLUDEPATH += $$QT.network_private.includes + include(bluez/bluez.pri) PRIVATE_HEADERS += \ @@ -265,7 +268,7 @@ qtConfig(bluez) { PRIVATE_HEADERS += qlowenergycontroller_p.h } -winrt-*-msvc2015 { +winrt { MODULE_WINRT_CAPABILITIES_DEVICE += \ bluetooth.genericAttributeProfile \ bluetooth.rfcomm |