Commit 2716d003 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge branch '5.9' into 5.12

Conflicts:
	.qmake.conf

Change-Id: Ifed1b763570377c86f476d48d3fb37698aeb9a20
Showing with 1656 additions and 0 deletions
This diff is collapsed.
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