Commit ae4f854d 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: I67661e95e931fd7c6992f8f1769c50472c5e5f15
parents b5f423f5 92e56ec2
No related merge requests found
Showing with 81 additions and 14 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