diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-06 03:01:34 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-06 03:01:34 +0200 |
commit | f03cfbc816b63086c0427e5026af3eed8037b836 (patch) | |
tree | e385366e30e7fa2c731a8bcdb470b870cb26347d /examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.cpp | |
parent | d89a4269ce1d9729842a508d97e1f1aeaf7305ee (diff) | |
parent | 2da4e162516830f4976f30c789a3fd9511dde932 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ibe09461a3c1541836cc3a766276114d4ac2a74d9
Diffstat (limited to 'examples/multimediawidgets/customvideosurface/customvideowidget/videoplayer.cpp')
0 files changed, 0 insertions, 0 deletions