diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:32:56 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:32:56 +0100 |
| commit | 176216459d84c59bf0cff26203928cfc144f164e (patch) | |
| tree | 6ea61597edc9091dde3a525a2c85036efb6c601b /src/bluetooth/qbluetoothlocaldevice_bluez.cpp | |
| parent | 117a0b3b03614ad9148a09fff4ca0dcff0ace86a (diff) | |
| parent | 35cf49f9973f96a6afc00269e930291d9edc238b (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3
Conflicts:
.qmake.conf
Change-Id: Ib02a916e3258fde37aae969b73df77eb9cb7eda8
Diffstat (limited to 'src/bluetooth/qbluetoothlocaldevice_bluez.cpp')
0 files changed, 0 insertions, 0 deletions