summaryrefslogtreecommitdiffstats
path: root/src/nfc/qnearfieldtarget.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-10 03:01:16 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-10 03:01:16 +0100
commit24892e65551f13b904b7b9043d225303a061671a (patch)
tree759f9967b5f90df09f7c51ed9728635a0b55ed0f /src/nfc/qnearfieldtarget.cpp
parentad484cb1d763d5b422c287182aadb7b5479acdd5 (diff)
parent7d653dea516ed8e756814532dc4be742f5e0ce78 (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Diffstat (limited to 'src/nfc/qnearfieldtarget.cpp')
0 files changed, 0 insertions, 0 deletions