diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 09:38:43 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 09:38:43 +0200 |
| commit | def63ee8702379928d9fc04e25d985538900d249 (patch) | |
| tree | e5820955cc098cda64831bc99dcaea1cad6d21e4 /src/bluetooth/darwin/btraii_p.h | |
| parent | 53b37dc58352e8e31e25b4bf3ab04f95bf82218a (diff) | |
| parent | eda28d82e239c57533e73be622b26a3985fb86ce (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp
Change-Id: Ie540a926afa800a73df6fedb23adb6502996a81b
Diffstat (limited to 'src/bluetooth/darwin/btraii_p.h')
0 files changed, 0 insertions, 0 deletions