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

Merge remote-tracking branch 'origin/5.6' into 5.7 

Conflicts:
	.qmake.conf

Change-Id: I3b738037529d1e99e595d7893d47352b7b5de1a0
parents 550bf471 f05e6784
Hide whitespace changes
Inline Side-by-side
Showing
with 2 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