summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-10-09 03:01:45 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-10-09 03:01:45 +0200
commit7ef3dfbd4354367ad78040010aa851943b7b9e75 (patch)
treefbcaf933bcd8e584a7bada0e580eb628dea21c43 /src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm
parent2f48ae33f0e1aa2e93faa3ca54006f7c6699f428 (diff)
parent35a97ca4b43b4dc481b907d37204613460b07bbd (diff)
Merge remote-tracking branch 'origin/5.12' into dev
Diffstat (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm')
0 files changed, 0 insertions, 0 deletions