Skip to content
GitLab
Commit 0a7482b9 authored by Qt Forward Merge Bot's avatar Qt Forward Merge Bot Committed by VaL Doroshchuk
Browse files

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
parents 82770701 56d43096
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 6 deletions
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment