Commit 7fdb88a8 authored by Liang Qi's avatar Liang Qi
Browse files

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

Conflicts:
	.qmake.conf

Change-Id: I20470ed193e818eefedd975d89f755fb9d673241
parents badecdbc a6cc1af0
Branches
Tags
No related merge requests found
Showing with 191 additions and 1428 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