diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:38:09 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:38:52 +0100 |
commit | 1653ae6e8782fb96999a53736a773e9a31d86b8a (patch) | |
tree | 33e114d791c9b9db48ceb79ffeb6c1ac7bab3493 /src/bluetooth/bluetooth.pro | |
parent | 4462750a68cb93b5d363b6efdbe1d6a6f0e5811f (diff) | |
parent | b274a83bf4f44d0e2642a8e3bd6bada4ccdbf83c (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I6e93fc7435a49b601a5c10519ed86d2a15125074
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 f675b0d9..ee548208 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -247,7 +247,7 @@ qtConfig(bluez) { PRIVATE_HEADERS += qlowenergycontroller_p.h } -winrt-*-msvc2015 { +winrt { MODULE_WINRT_CAPABILITIES_DEVICE += \ bluetooth.genericAttributeProfile \ bluetooth.rfcomm |