Skip to content
GitLab
Commit 75c0cf94 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: Iaf1281a9b6fc851362c42621fc4109536da88058
parents 9ba1bb61 f8fc6ba8
Hide whitespace changes
Inline Side-by-side
Showing
with 24 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