diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-15 03:04:31 +0200 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-10-15 07:00:43 +0000 |
| commit | 0a7482b97a9247f728730c1a2cf222f8a24a88c4 (patch) | |
| tree | edf415542a36413342c10e700471ced6268d62c7 /examples/multimedia | |
| parent | 8277070128197744c0073c867dc78caea912bfce (diff) | |
| parent | 56d430962a50af234902cd799920a5b6df6d80eb (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/multimedia/video/qvideoframe.cpp
src/plugins/directshow/player/directshowplayercontrol.cpp
Change-Id: I00840245e35861cf4fe1d62789815ca125b2052a
Diffstat (limited to 'examples/multimedia')
0 files changed, 0 insertions, 0 deletions