Commit cd26439a 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: I4af142703e469b56236b73335a93f6960534c0f1
parents 5775c5e3 b05ec56d
Branches
Tags
No related merge requests found
Showing with 54 additions and 11 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