Skip to content
GitLab
Commit dfc91928 authored by Liang Qi's avatar Liang Qi
Browse files

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

Conflicts:
	.qmake.conf

Change-Id: If50b73b1f1e293269404bd8b38088119a0f59f1f
parents a0aec91b 670266a0
Hide whitespace changes
Inline Side-by-side
Showing
with 10404 additions and 40 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