Commit 3ac87eeb authored by Liang Qi's avatar Liang Qi
Browse files

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

Conflicts:
	.qmake.conf

Change-Id: If94e1ceeb1b03ef59bf5760931fdba9527815064
Showing with 173 additions and 32 deletions
Supports Markdown
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