Commit bba25237 authored by Alex Blasche's avatar Alex Blasche
Browse files

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

Conflicts:
	.qmake.conf

Change-Id: Ib269ecd9a61ebe25da23a0423682b591f7c399c3
parents 2fed04bc fd821747
No related merge requests found
Showing with 75 additions and 10 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