Commit 26948c9f 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: I0e80e21ad539df24e7b1b60675c4d52d61d96142
parents a2f11a5c 1f3b9acc
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