summaryrefslogtreecommitdiffstats
path: root/src/imports/nfc/qdeclarativenearfieldsocket.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-03-07 03:07:09 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-03-07 03:07:09 +0100
commit35fe7d452d5b85eabe1c3ec9d09019fe4f3e2d2e (patch)
tree528d85e9b75e8450295a259e05266a834780642d /src/imports/nfc/qdeclarativenearfieldsocket.cpp
parent531443d1f00c0ebc6a56ebc30e5eea85b318b73e (diff)
parent58e0224a6677667b1102b34ad5b35a787bd74077 (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta4v5.15.0-beta3v5.15.0-beta2
Diffstat (limited to 'src/imports/nfc/qdeclarativenearfieldsocket.cpp')
0 files changed, 0 insertions, 0 deletions