summaryrefslogtreecommitdiffstats
path: root/src/corelib/thread/qfutureinterface.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-06 09:44:09 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-06 09:44:10 +0200
commitcaf123a28805f6de1de3144ea496712543b878cd (patch)
tree9eae94d6bee228c62c942c37296f96a91349c4c9 /src/corelib/thread/qfutureinterface.cpp
parentbf8fcab8bb92ff534c5cec048d6dbebb3b73a348 (diff)
parentd2894d968d50619c894e06b1e9f8b0f52e434222 (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Diffstat (limited to 'src/corelib/thread/qfutureinterface.cpp')
0 files changed, 0 insertions, 0 deletions