Commit f4da6a3a authored by Frederik Gladhorn's avatar Frederik Gladhorn
Browse files

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

Conflicts:
	.qmake.conf

Change-Id: Iaffc08b9bd62e43d866a60785b0a2e6ac3a46010
parents 1f50edbd 15d01c80
No related merge requests found
Showing with 0 additions and 0 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