Skip to content
GitLab
Commit 6f0bf6bc authored by Liang Qi's avatar Liang Qi
Browse files

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

 Conflicts:
	.qmake.conf

Change-Id: I230e21638604fe75b6f1d6b7877f9bc4b2d2c020
parents 51658fac 2e06a051
Hide whitespace changes
Inline Side-by-side
Showing
with 4 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