Skip to content
GitLab
Commit 9a67c418 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: If24938cb15392873cfd45c49901c6f1cc3e9f128
parents 691d62dc d367ac81
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 111 additions and 92 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