summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qsocketnotifier.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-04-20 23:39:16 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-04-20 23:39:17 +0200
commit5725cb72f18ac24abb207940570617f1009d06c3 (patch)
tree233c1ebe1a0b6bff0568de159280f2f2edad3f31 /src/corelib/kernel/qsocketnotifier.h
parentfa83b30ceb1861075e33dc8340d6754daef86b95 (diff)
parent3e6089b695489d5ba513723230a54b4b5e8349ae (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
Diffstat (limited to 'src/corelib/kernel/qsocketnotifier.h')
0 files changed, 0 insertions, 0 deletions