Commit 99e899a6 authored by Liang Qi's avatar Liang Qi
Browse files

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

Conflicts:
	.qmake.conf

Change-Id: Ia49d4eff8606e99c7f90d78303d8e1a08f528618
parents 8ff54bdc 11200e04
Branches
Tags
No related merge requests found
Showing with 149 additions and 211 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