Commit 32c3d9bb authored by Liang Qi's avatar Liang Qi
Browse files

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

Conflicts:
	.qmake.conf

Change-Id: I593c47e7aeebb7997f42a7408a8d22704d2713a1
parents 5bc48a44 38d830d0
No related merge requests found
Showing with 51 additions and 8 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