Commit 45cd9f66 authored by Liang Qi's avatar Liang Qi
Browse files

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

Conflicts:
	.qmake.conf

Change-Id: Icba6315772d2c31eb30f02460b2b282d12b33d37
parents 962ea707 5508cd19
Showing with 27 additions and 11 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