Skip to content
GitLab
Commit 09fa8225 authored by Qt Forward Merge Bot's avatar Qt Forward Merge Bot
Browse files

Merge remote-tracking branch 'origin/5.13' into 5.14 

 Conflicts:
	.qmake.conf

Change-Id: I73cc3d9c4a38e6c586ac0c2f54c94184d65c560a
parents d5a8b582 2216279f
No related merge requests found
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