summaryrefslogtreecommitdiff
path: root/src/bluetooth/qbluetoothsocket.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-05-01 03:00:31 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-05-01 03:00:31 +0200
commit43ad63af503bfb6297a31603112b5d510c3faae0 (patch)
treea2b84e4a1526515ae272c150f8e5c3df9e16f11b /src/bluetooth/qbluetoothsocket.cpp
parent32e5af2f9322e25ed4e9a61036f48262b8f56ee7 (diff)
parentef332e4deedc914fe33bab68107f902182e03356 (diff)
downloadqtconnectivity-43ad63af503bfb6297a31603112b5d510c3faae0.tar.gz
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia496130e0d71a85670af3ca1cadf81c71d3c2462
Diffstat (limited to 'src/bluetooth/qbluetoothsocket.cpp')
0 files changed, 0 insertions, 0 deletions