summaryrefslogtreecommitdiffstats
path: root/src/multimediawidgets/qvideowidget.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-28 03:02:53 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-28 03:02:53 +0100
commit81e0861c60899c14395903b053b1045210740a43 (patch)
tree72a47d355ae556d20338dadb978bceb8972a434f /src/multimediawidgets/qvideowidget.h
parent836bde2ba1a3fc5bdce51aad839e07fb7584af35 (diff)
parent265bfb22e7f0f5333e584f6dd91926b8516e394e (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
Diffstat (limited to 'src/multimediawidgets/qvideowidget.h')
0 files changed, 0 insertions, 0 deletions