summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-09 03:05:34 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2019-07-11 14:39:26 +0200
commit1a645c5a9b7d8b3f2f1448a95a3f37eb2f0c5a5d (patch)
tree5f0f4d8866b8ce2294c08a0932e0adfd3df613f4 /src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp
parent4d6a1030fd172641caacbc75b9e73cbc5b8da825 (diff)
parentba19fd348374688057da4cac9a767eed863a5468 (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp')
0 files changed, 0 insertions, 0 deletions