Commit 8f012dd0 authored by Frederik Gladhorn's avatar Frederik Gladhorn
Browse files

Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	.qmake.conf

Change-Id: Id327fd1d5933b38c3fcc3f7e9edadb34aaf7a059
parents 6c7ecc08 b2f9aaa6
No related merge requests found
Showing with 114 additions and 87 deletions
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