Commit f4177c1d authored by Liang Qi's avatar Liang Qi
Browse files

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

Conflicts:
	.qmake.conf

Change-Id: I4ab46a953b46b63c6819995ab3c369599e5d3551
parents 493fc27b 0544c2b4
No related merge requests found
Showing with 82 additions and 1435 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