Skip to content
GitLab
Commit a3306164 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.h

Change-Id: I8458c4138be05f661d6528116cbc6b18298f0a91
parents 48206ccc 545959e4
dev 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 6.2 6.2.0 6.2.1 6.2.2 wip/qt6 v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 52 additions and 46 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