diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-31 03:01:11 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 10:21:38 +0200 |
| commit | f9ad6b0afeb1b4106f82803675425d7e6e708bdb (patch) | |
| tree | ad134723aa2e4d972d165c48b1a384d67d999b0d /src/bluetooth/bluez | |
| parent | de75c33d431fd9281175de51218e02fdf03afa7c (diff) | |
| parent | 9b48eeaa970926a60a886cadd54414f659a0af18 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
src/bluetooth/qbluetoothsocket.cpp
Change-Id: If622e4915a9c5f6711978ef8c0fa88f4c5084270
Diffstat (limited to 'src/bluetooth/bluez')
0 files changed, 0 insertions, 0 deletions