diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:16:36 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-21 20:30:52 +0100 |
| commit | 49b6eaede5ce149a7517718c5c59b92d25adb7d5 (patch) | |
| tree | 4c0be18a2f191bf587e365eb04818f90dddc1645 /src/bluetooth/qbluetoothserver_p.h | |
| parent | 32623c4686d069305c8f7e046038cfcc5817052a (diff) | |
| parent | 5a38231103159346c976a620c01fba37eea85d92 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/bluetooth/bluetooth.pro
Change-Id: Ibccccc974b545696ae053f1fbffcc973d8be43cc
Diffstat (limited to 'src/bluetooth/qbluetoothserver_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothserver_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bluetooth/qbluetoothserver_p.h b/src/bluetooth/qbluetoothserver_p.h index 4abadc72..9c414cdb 100644 --- a/src/bluetooth/qbluetoothserver_p.h +++ b/src/bluetooth/qbluetoothserver_p.h @@ -70,6 +70,8 @@ class ServerAcceptanceThread; #endif #ifdef QT_WINRT_BLUETOOTH +#include <QtCore/QMutex> + #include <wrl.h> // No forward declares because QBluetoothServerPrivate::listener does not work with them #include <windows.networking.sockets.h> |