Commit 544d3e4f 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: Id1598f42c2fa8a3f2eb16d1f0a357f14b4a2b028
parents ad15ca27 d252eb8a
Showing with 25 additions and 0 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