Commit b65de45f authored by Liang Qi's avatar Liang Qi
Browse files

Merge remote-tracking branch 'origin/5.9' into 5.10

 Conflicts:
	.qmake.conf

Change-Id: If12daffe4655f71d9aea39e0ed9e0db405a09fe7
parents ef2872b2 81b1ae51
Showing with 53 additions and 5 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