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

Merge remote-tracking branch 'origin/5.4' into 5.5 

Conflicts:
	.qmake.conf

Change-Id: Iafa184859c6610a39f4251e6ca59d0863eed3ae0
parents f15384fe 18248812
Hide whitespace changes
Inline Side-by-side
Showing
with 0 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