diff options
author | Alex Blasche <alexander.blasche@qt.io> | 2016-10-11 15:36:14 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@qt.io> | 2016-10-12 11:30:14 +0200 |
commit | 515ff5b0f9a2245a13cec6f2d37edd1715cdae8c (patch) | |
tree | 3a7748f578d772a5a4e9bcd8b09168657146d695 /src/bluetooth/qbluetoothdevicediscoveryagent.cpp | |
parent | ca661f332886760f2154ed7ed14550722c554943 (diff) | |
parent | 7b443cd0fdd1940a8bfaad73df5e309a52b7669f (diff) |
Merge remote-tracking branch 'gerrit/5.7' into 5.8v5.8.0-beta1
Conflicts:
src/bluetooth/osx/osxbtledeviceinquiry.mm
src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm
Change-Id: I7dc75c187af73917f31c28b9edfaf8bcf9652a3e
Diffstat (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent.cpp')
0 files changed, 0 insertions, 0 deletions