diff options
author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-09-12 11:55:37 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-09-12 12:36:07 +0200 |
commit | 9ebd29eafed687ae19ec02aa0bd566f60377ceec (patch) | |
tree | f70f9d0f4fae4ee369a892f71a6f323c1113cfc3 /src/bluetooth/qbluetoothsocket_win.cpp | |
parent | 2c6dcc643f29c212fca0ead123a377e96b9a17c9 (diff) | |
parent | c1803d266854c6f71994705133e5b2b93a060d1e (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/bluetooth/qbluetoothdevicediscoveryagent_darwin.mm
src/bluetooth/qbluetoothserver_osx.mm
src/bluetooth/qbluetoothserviceinfo_osx.mm
src/bluetooth/qbluetoothsocket_osx.mm
Change-Id: I24485ae835560fa1e57007fb684f6532db3e7922
Diffstat (limited to 'src/bluetooth/qbluetoothsocket_win.cpp')
0 files changed, 0 insertions, 0 deletions