Commit 49c5461a 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: If135b3be3bfe1d9c44c44dad9f006161a6c7dc19
parents 1f9e8a54 34796716
Showing with 32 additions and 2 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