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

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

Conflicts:
	.qmake.conf

Change-Id: Ia6897047e8baf34681acf9512978d26dc00b37c5
parents 4e252367 167f91be
Hide whitespace changes
Inline Side-by-side
Showing
with 23 additions and 7 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