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

Merge remote-tracking branch 'origin/5.9.7' into 5.9 

 Conflicts:
	config.tests/openssl/openssl.cpp
	src/plugins/platforms/windows/qwindowsintegration.cpp

Change-Id: I93ad86751693f4f64981f1c3723bac2061c05379
parents 1288c5b0 81b29a44
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 13798 additions and 13327 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