diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-07 03:07:09 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-07 03:07:09 +0100 |
commit | 35fe7d452d5b85eabe1c3ec9d09019fe4f3e2d2e (patch) | |
tree | 528d85e9b75e8450295a259e05266a834780642d /src/imports/nfc/qdeclarativenearfieldsocket.cpp | |
parent | 531443d1f00c0ebc6a56ebc30e5eea85b318b73e (diff) | |
parent | 58e0224a6677667b1102b34ad5b35a787bd74077 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta4v5.15.0-beta3v5.15.0-beta2
Change-Id: I037246140f5c52dde3335952d4bf77e43b1c3503
Diffstat (limited to 'src/imports/nfc/qdeclarativenearfieldsocket.cpp')
0 files changed, 0 insertions, 0 deletions